diff --git a/scripts/startup/bl_ui/space_dopesheet.py b/scripts/startup/bl_ui/space_dopesheet.py index dfd24377649..77027621fac 100644 --- a/scripts/startup/bl_ui/space_dopesheet.py +++ b/scripts/startup/bl_ui/space_dopesheet.py @@ -16,8 +16,9 @@ from bl_ui.properties_data_grease_pencil import ( GreasePencil_LayerAdjustmentsPanel, GreasePencil_LayerDisplayPanel, ) -from bl_ui.space_toolsystem_common import PlayheadSnappingPanel - +from bl_ui.utils import ( + PlayheadSnappingPanel, +) from rna_prop_ui import PropertyPanel diff --git a/scripts/startup/bl_ui/space_graph.py b/scripts/startup/bl_ui/space_graph.py index 2627ca47e70..2029a1f3f5b 100644 --- a/scripts/startup/bl_ui/space_graph.py +++ b/scripts/startup/bl_ui/space_graph.py @@ -8,8 +8,9 @@ from bl_ui.space_dopesheet import ( DopesheetFilterPopoverBase, dopesheet_filter, ) - -from bl_ui.space_toolsystem_common import PlayheadSnappingPanel +from bl_ui.utils import ( + PlayheadSnappingPanel, +) class GRAPH_PT_playhead_snapping(PlayheadSnappingPanel, Panel): diff --git a/scripts/startup/bl_ui/space_nla.py b/scripts/startup/bl_ui/space_nla.py index 863ffb9aa75..e57f42adb03 100644 --- a/scripts/startup/bl_ui/space_nla.py +++ b/scripts/startup/bl_ui/space_nla.py @@ -9,8 +9,9 @@ from bl_ui.space_dopesheet import ( DopesheetActionPanelBase, dopesheet_filter, ) - -from bl_ui.space_toolsystem_common import PlayheadSnappingPanel +from bl_ui.utils import ( + PlayheadSnappingPanel, +) class NLA_PT_playhead_snapping(PlayheadSnappingPanel, Panel): diff --git a/scripts/startup/bl_ui/space_sequencer.py b/scripts/startup/bl_ui/space_sequencer.py index a4ea29a2e2e..0db9c383902 100644 --- a/scripts/startup/bl_ui/space_sequencer.py +++ b/scripts/startup/bl_ui/space_sequencer.py @@ -18,8 +18,11 @@ from bl_ui.properties_grease_pencil_common import ( ) from bl_ui.space_toolsystem_common import ( ToolActivePanelHelper, +) +from bl_ui.utils import ( PlayheadSnappingPanel, ) + from rna_prop_ui import PropertyPanel diff --git a/scripts/startup/bl_ui/space_toolsystem_common.py b/scripts/startup/bl_ui/space_toolsystem_common.py index 7f0c77181a6..033ce31cb5c 100644 --- a/scripts/startup/bl_ui/space_toolsystem_common.py +++ b/scripts/startup/bl_ui/space_toolsystem_common.py @@ -1239,33 +1239,6 @@ def _keymap_from_item(context, item): return None -class PlayheadSnappingPanel: - bl_region_type = 'HEADER' - bl_label = "Playhead" - - @classmethod - def poll(cls, context): - del context - return True - - def draw(self, context): - tool_settings = context.tool_settings - layout = self.layout - col = layout.column() - - col.prop(tool_settings, "use_snap_playhead") - col.prop(tool_settings, "playhead_snap_distance") - col.separator() - col.label(text="Snap Target") - col.prop(tool_settings, "snap_playhead_element", expand=True) - col.separator() - - if 'FRAME' in tool_settings.snap_playhead_element: - col.prop(tool_settings, "snap_playhead_frame_step") - if 'SECOND' in tool_settings.snap_playhead_element: - col.prop(tool_settings, "snap_playhead_second_step") - - classes = ( WM_MT_toolsystem_submenu, ) diff --git a/scripts/startup/bl_ui/utils.py b/scripts/startup/bl_ui/utils.py index 0bc3814745c..a41a4747f89 100644 --- a/scripts/startup/bl_ui/utils.py +++ b/scripts/startup/bl_ui/utils.py @@ -38,3 +38,30 @@ class PresetPanel: layout.operator_context = 'EXEC_DEFAULT' Menu.draw_preset(self, context) + + +class PlayheadSnappingPanel: + bl_region_type = 'HEADER' + bl_label = "Playhead" + + @classmethod + def poll(cls, context): + del context + return True + + def draw(self, context): + tool_settings = context.tool_settings + layout = self.layout + col = layout.column() + + col.prop(tool_settings, "use_snap_playhead") + col.prop(tool_settings, "playhead_snap_distance") + col.separator() + col.label(text="Snap Target") + col.prop(tool_settings, "snap_playhead_element", expand=True) + col.separator() + + if 'FRAME' in tool_settings.snap_playhead_element: + col.prop(tool_settings, "snap_playhead_frame_step") + if 'SECOND' in tool_settings.snap_playhead_element: + col.prop(tool_settings, "snap_playhead_second_step")