UI: Icons for playhead snapping

The recently introduced feature of playhead snapping (#137278) added a popover menu for snap targets. This used text to indicate the contents of said popover. In order to bring it in line with the other snapping menu, this PR adds icons to indicate the enabled state of snapping. Part of #135794 Pull Request: https://projects.blender.org/blender/blender/pulls/139271
2025-08-05 09:01:56 +02:00
parent de9b24abad
commit befe6062c0
10 changed files with 155 additions and 5 deletions
--- a/release/datafiles/icons_svg/playhead_snap_off.svg
+++ b/release/datafiles/icons_svg/playhead_snap_off.svg
@@ -0,0 +1,66 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   width="1800"
+   height="1800"
+   viewBox="0 0 1800 1800"
+   version="1.1"
+   id="svg1"
+   xml:space="preserve"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg"><defs
+     id="defs1" /><g
+     id="g19"
+     style="display:none"><path
+       id="path18"
+       style="baseline-shift:baseline;display:inline;overflow:visible;opacity:1;vector-effect:none;fill:#ffffff;fill-opacity:0.5;stroke-width:16.6562;stroke-linecap:round;enable-background:accumulate;stop-color:#000000;stop-opacity:1"
+       d="m 261.00936,1197.3233 c -22.44368,0 -40.63811,23.9084 -40.63717,53.4021 -9.4e-4,29.4938 18.19349,53.4034 40.63717,53.4022 H 719.5509 v -106.8043 z m 822.41984,0 v 106.8043 h 461.0194 c 22.4437,0 44.0266,-23.9084 44.0257,-53.4022 9e-4,-29.4937 -21.582,-53.4034 -44.0257,-53.4021 z" /><path
+       id="path19"
+       style="baseline-shift:baseline;display:inline;overflow:visible;opacity:1;vector-effect:none;fill:#ffffff;fill-opacity:0.5;stroke-width:21.5045;stroke-linecap:round;stroke-linejoin:round;enable-background:accumulate;stop-color:#000000;stop-opacity:1"
+       d="m 401.56096,403.51892 c -60.21593,0 -106.93205,36.61015 -106.93205,102.26533 v 495.97935 c 0,40.1547 41.07857,95.6363 104.72235,95.6363 h 416.65069 v 522.4517 H 989.45703 V 1097.3999 H 1399.812 c 69.0462,0 102.3231,-43.3726 102.3231,-101.16056 V 505.78425 c 0,-29.01967 -5.6551,-102.25624 -101.2182,-102.26533 z" /><path
+       id="path20"
+       style="baseline-shift:baseline;display:inline;overflow:visible;opacity:1;vector-effect:none;fill:#ffffff;fill-opacity:0.5;stroke-width:16.6562;stroke-linecap:round;enable-background:accumulate;stop-color:#000000;stop-opacity:1"
+       d="m 261.00936,199.07094 c -22.44368,0 -40.63811,23.9084 -40.63717,53.4021 -9.4e-4,29.4938 18.19349,53.4034 40.63717,53.4022 h 841.90344 v -106.8043 z m 822.41984,0 v 106.8043 h 461.0194 c 22.4437,0 44.0266,-23.9084 44.0257,-53.4022 9e-4,-29.4937 -21.582,-53.4034 -44.0257,-53.4021 z" /></g><g
+     id="g23"
+     style="display:none"><path
+       id="path21"
+       style="baseline-shift:baseline;display:inline;overflow:visible;opacity:1;vector-effect:none;fill:#ffffff;fill-opacity:0.5;stroke-width:16.6562;stroke-linecap:round;enable-background:accumulate;stop-color:#000000;stop-opacity:1"
+       d="m 334.23818,1197.3233 c -22.44368,0 -40.63811,23.9084 -40.63717,53.4021 -9.4e-4,29.4938 18.19349,53.4034 40.63717,53.4022 h 401.90075 l -29.36676,-106.8043 z" /><path
+       id="path22"
+       style="baseline-shift:baseline;display:inline;overflow:visible;opacity:1;vector-effect:none;fill:#ffffff;fill-opacity:1;stroke-width:21.5045;stroke-linecap:round;stroke-linejoin:round;enable-background:accumulate;stop-color:#000000;stop-opacity:1"
+       d="m 190.7119,403.51892 c -60.21593,0 -94.23944,36.61015 -71.47703,102.26533 l 171.95424,495.97935 c 13.92148,40.1547 74.23532,95.6363 137.8791,95.6363 H 845.7189 l 110.46276,318.6153 125.37334,-138.6856 -62.381,-179.9297 h 410.355 c 69.0462,0 87.2859,-43.3726 67.2511,-101.16056 L 1326.7411,505.78425 C 1316.68,476.76458 1285.6341,403.52801 1190.0678,403.51892 Z" /><path
+       id="path23"
+       style="baseline-shift:baseline;display:inline;overflow:visible;opacity:1;vector-effect:none;fill:#ffffff;fill-opacity:0.5;stroke-width:16.6562;stroke-linecap:round;enable-background:accumulate;stop-color:#000000;stop-opacity:1"
+       d="m 142.8061,199.07094 c -22.44368,0 -40.63811,23.9084 -40.63717,53.4021 -9.4e-4,29.4938 18.19349,53.4034 40.63717,53.4022 h 841.90344 v -106.8043 z m 822.41984,0 v 106.8043 h 461.01936 c 22.4437,0 44.0266,-23.9084 44.0257,-53.4022 9e-4,-29.4937 -21.582,-53.4034 -44.0257,-53.4021 z" /><path
+       d="m 1673.7709,1400.6006 c -26.9979,-21.8073 -66.7223,-17.9224 -88.6678,8.6122 l -121.4749,142.2504 -241.4915,-200.8646 c -26.6756,-22.1832 -66.425,-18.9401 -88.7899,7.2439 l -161.96639,189.6672 c -55.72373,63.3193 42.76229,145.2368 96.59649,80.3459 l 121.4749,-142.2505 241.4914,200.8647 c 26.6757,22.183 66.4252,18.94 88.79,-7.2439 l 161.9664,-189.6673 c 23.2447,-26.4465 19.6948,-66.6987 -7.9287,-88.958 z"
+       style="display:inline;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:99.6416;stroke-opacity:1"
+       id="path1-0-3-3" /></g><g
+     id="g1"
+     transform="translate(82.74029,120.31173)"
+     style="display:inline"><path
+       style="fill:none;fill-opacity:1;stroke:#ffffff;stroke-width:100;stroke-linecap:round;stroke-linejoin:round;stroke-dasharray:none;stroke-opacity:0.6"
+       d="m 819.75755,393.47167 c -307.01028,0 -300.99352,286.4846 -300.99352,286.4846 V 1029.7741 H 268.6748 V 683.79244 c 0,-360.18252 215.19387,-558.83289 551.08275,-558.83289 m 0,268.51212 c 307.01025,0 300.99355,286.4846 300.99355,286.4846 v 349.81783 h 250.0892 V 683.79244 c 0,-360.18252 -215.1939,-558.83289 -551.08275,-558.83289"
+       id="path3"
+       transform="translate(-2.4978449)" /><path
+       style="display:inline;fill:none;fill-opacity:1;stroke:#ffffff;stroke-width:100;stroke-linecap:round;stroke-linejoin:round;stroke-dasharray:none;stroke-opacity:0.6"
+       d="M 113.73269,1330.0742 H 1527.3797"
+       id="path4" /></g><g
+     id="layer1"
+     transform="translate(-25.557461,25.557461)"
+     style="display:none"><path
+       id="path6"
+       style="baseline-shift:baseline;display:inline;overflow:visible;opacity:1;vector-effect:none;fill:#ffffff;fill-opacity:0.6;stroke-linecap:round;stroke-linejoin:round;enable-background:accumulate;stop-color:#000000;stop-opacity:1"
+       d="m 113.73237,1280.075 a 50,50 0 0 0 -50.000003,50 50,50 0 0 0 50.000003,50 h 300.99804 v -100 z m 1106.05663,0 v 100 h 307.5899 a 50,50 0 0 0 50,-50 50,50 0 0 0 -50,-50 z"
+       transform="translate(108.29775,94.754269)" /><path
+       style="fill:none;fill-opacity:1;fill-rule:nonzero;stroke:#ffffff;stroke-width:120;stroke-linecap:round;stroke-linejoin:round;stroke-dasharray:none;stroke-opacity:0.9"
+       d="M 977.0154,1510.687 825.8603,1329.4462 1021.1458,1126.9671 878.02524,952.55849"
+       id="path7" /><path
+       style="display:inline;fill:#ffffff;fill-opacity:1;stroke:#ffffff;stroke-width:100;stroke-linecap:round;stroke-linejoin:round;stroke-dasharray:none;stroke-opacity:1"
+       d="m 819.75755,389.05225 c -307.01028,0 -300.99352,290.90402 -300.99352,290.90402 v 53.71686 H 268.6748 v -49.88069 c 0,-360.18252 215.19387,-554.41347 551.08275,-554.41347 m 0,259.67328 c 307.01025,0 300.99355,290.90402 300.99355,290.90402 v 53.71686 h 250.0892 v -49.88069 c 0,-360.18252 -215.1939,-554.41347 -551.08275,-554.41347"
+       id="path11"
+       transform="translate(105.79991,94.754269)" /><path
+       style="display:inline;fill:#ffffff;fill-opacity:1;stroke:#ffffff;stroke-width:100;stroke-linecap:round;stroke-linejoin:round;stroke-dasharray:none;stroke-opacity:1"
+       d="m 518.76403,935.53088 v 94.24322 H 268.6748 v -94.24322 z m 601.98707,0 v 94.24322 h 250.0892 v -94.24322 z"
+       id="path8"
+       transform="translate(105.79991,94.754269)" /></g></svg>
--- a/release/datafiles/icons_svg/playhead_snap_on.svg
+++ b/release/datafiles/icons_svg/playhead_snap_on.svg
@@ -0,0 +1,66 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   width="1800"
+   height="1800"
+   viewBox="0 0 1800 1800"
+   version="1.1"
+   id="svg1"
+   xml:space="preserve"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg"><defs
+     id="defs1" /><g
+     id="g19"
+     style="display:none"><path
+       id="path18"
+       style="baseline-shift:baseline;display:inline;overflow:visible;opacity:1;vector-effect:none;fill:#ffffff;fill-opacity:0.5;stroke-width:16.6562;stroke-linecap:round;enable-background:accumulate;stop-color:#000000;stop-opacity:1"
+       d="m 261.00936,1197.3233 c -22.44368,0 -40.63811,23.9084 -40.63717,53.4021 -9.4e-4,29.4938 18.19349,53.4034 40.63717,53.4022 H 719.5509 v -106.8043 z m 822.41984,0 v 106.8043 h 461.0194 c 22.4437,0 44.0266,-23.9084 44.0257,-53.4022 9e-4,-29.4937 -21.582,-53.4034 -44.0257,-53.4021 z" /><path
+       id="path19"
+       style="baseline-shift:baseline;display:inline;overflow:visible;opacity:1;vector-effect:none;fill:#ffffff;fill-opacity:0.5;stroke-width:21.5045;stroke-linecap:round;stroke-linejoin:round;enable-background:accumulate;stop-color:#000000;stop-opacity:1"
+       d="m 401.56096,403.51892 c -60.21593,0 -106.93205,36.61015 -106.93205,102.26533 v 495.97935 c 0,40.1547 41.07857,95.6363 104.72235,95.6363 h 416.65069 v 522.4517 H 989.45703 V 1097.3999 H 1399.812 c 69.0462,0 102.3231,-43.3726 102.3231,-101.16056 V 505.78425 c 0,-29.01967 -5.6551,-102.25624 -101.2182,-102.26533 z" /><path
+       id="path20"
+       style="baseline-shift:baseline;display:inline;overflow:visible;opacity:1;vector-effect:none;fill:#ffffff;fill-opacity:0.5;stroke-width:16.6562;stroke-linecap:round;enable-background:accumulate;stop-color:#000000;stop-opacity:1"
+       d="m 261.00936,199.07094 c -22.44368,0 -40.63811,23.9084 -40.63717,53.4021 -9.4e-4,29.4938 18.19349,53.4034 40.63717,53.4022 h 841.90344 v -106.8043 z m 822.41984,0 v 106.8043 h 461.0194 c 22.4437,0 44.0266,-23.9084 44.0257,-53.4022 9e-4,-29.4937 -21.582,-53.4034 -44.0257,-53.4021 z" /></g><g
+     id="g23"
+     style="display:none"><path
+       id="path21"
+       style="baseline-shift:baseline;display:inline;overflow:visible;opacity:1;vector-effect:none;fill:#ffffff;fill-opacity:0.5;stroke-width:16.6562;stroke-linecap:round;enable-background:accumulate;stop-color:#000000;stop-opacity:1"
+       d="m 334.23818,1197.3233 c -22.44368,0 -40.63811,23.9084 -40.63717,53.4021 -9.4e-4,29.4938 18.19349,53.4034 40.63717,53.4022 h 401.90075 l -29.36676,-106.8043 z" /><path
+       id="path22"
+       style="baseline-shift:baseline;display:inline;overflow:visible;opacity:1;vector-effect:none;fill:#ffffff;fill-opacity:1;stroke-width:21.5045;stroke-linecap:round;stroke-linejoin:round;enable-background:accumulate;stop-color:#000000;stop-opacity:1"
+       d="m 190.7119,403.51892 c -60.21593,0 -94.23944,36.61015 -71.47703,102.26533 l 171.95424,495.97935 c 13.92148,40.1547 74.23532,95.6363 137.8791,95.6363 H 845.7189 l 110.46276,318.6153 125.37334,-138.6856 -62.381,-179.9297 h 410.355 c 69.0462,0 87.2859,-43.3726 67.2511,-101.16056 L 1326.7411,505.78425 C 1316.68,476.76458 1285.6341,403.52801 1190.0678,403.51892 Z" /><path
+       id="path23"
+       style="baseline-shift:baseline;display:inline;overflow:visible;opacity:1;vector-effect:none;fill:#ffffff;fill-opacity:0.5;stroke-width:16.6562;stroke-linecap:round;enable-background:accumulate;stop-color:#000000;stop-opacity:1"
+       d="m 142.8061,199.07094 c -22.44368,0 -40.63811,23.9084 -40.63717,53.4021 -9.4e-4,29.4938 18.19349,53.4034 40.63717,53.4022 h 841.90344 v -106.8043 z m 822.41984,0 v 106.8043 h 461.01936 c 22.4437,0 44.0266,-23.9084 44.0257,-53.4022 9e-4,-29.4937 -21.582,-53.4034 -44.0257,-53.4021 z" /><path
+       d="m 1673.7709,1400.6006 c -26.9979,-21.8073 -66.7223,-17.9224 -88.6678,8.6122 l -121.4749,142.2504 -241.4915,-200.8646 c -26.6756,-22.1832 -66.425,-18.9401 -88.7899,7.2439 l -161.96639,189.6672 c -55.72373,63.3193 42.76229,145.2368 96.59649,80.3459 l 121.4749,-142.2505 241.4914,200.8647 c 26.6757,22.183 66.4252,18.94 88.79,-7.2439 l 161.9664,-189.6673 c 23.2447,-26.4465 19.6948,-66.6987 -7.9287,-88.958 z"
+       style="display:inline;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:99.6416;stroke-opacity:1"
+       id="path1-0-3-3" /></g><g
+     id="g1"
+     transform="translate(82.74029,120.31173)"
+     style="display:none"><path
+       style="fill:none;fill-opacity:1;stroke:#ffffff;stroke-width:100;stroke-linecap:round;stroke-linejoin:round;stroke-dasharray:none;stroke-opacity:0.6"
+       d="m 819.75755,393.47167 c -307.01028,0 -300.99352,286.4846 -300.99352,286.4846 V 1029.7741 H 268.6748 V 683.79244 c 0,-360.18252 215.19387,-558.83289 551.08275,-558.83289 m 0,268.51212 c 307.01025,0 300.99355,286.4846 300.99355,286.4846 v 349.81783 h 250.0892 V 683.79244 c 0,-360.18252 -215.1939,-558.83289 -551.08275,-558.83289"
+       id="path3"
+       transform="translate(-2.4978449)" /><path
+       style="display:inline;fill:none;fill-opacity:1;stroke:#ffffff;stroke-width:100;stroke-linecap:round;stroke-linejoin:round;stroke-dasharray:none;stroke-opacity:0.6"
+       d="M 113.73269,1330.0742 H 1527.3797"
+       id="path4" /></g><g
+     id="layer1"
+     transform="translate(-25.557461,25.557461)"
+     style="display:inline"><path
+       id="path6"
+       style="baseline-shift:baseline;display:inline;overflow:visible;opacity:1;vector-effect:none;fill:#ffffff;fill-opacity:0.6;stroke-linecap:round;stroke-linejoin:round;enable-background:accumulate;stop-color:#000000;stop-opacity:1"
+       d="m 113.73237,1280.075 a 50,50 0 0 0 -50.000003,50 50,50 0 0 0 50.000003,50 h 300.99804 v -100 z m 1106.05663,0 v 100 h 307.5899 a 50,50 0 0 0 50,-50 50,50 0 0 0 -50,-50 z"
+       transform="translate(108.29775,94.754269)" /><path
+       style="fill:none;fill-opacity:1;fill-rule:nonzero;stroke:#ffffff;stroke-width:120;stroke-linecap:round;stroke-linejoin:round;stroke-dasharray:none;stroke-opacity:0.9"
+       d="M 977.0154,1510.687 825.8603,1329.4462 1021.1458,1126.9671 878.02524,952.55849"
+       id="path7" /><path
+       style="display:inline;fill:#ffffff;fill-opacity:1;stroke:#ffffff;stroke-width:100;stroke-linecap:round;stroke-linejoin:round;stroke-dasharray:none;stroke-opacity:1"
+       d="m 819.75755,389.05225 c -307.01028,0 -300.99352,290.90402 -300.99352,290.90402 v 53.71686 H 268.6748 v -49.88069 c 0,-360.18252 215.19387,-554.41347 551.08275,-554.41347 m 0,259.67328 c 307.01025,0 300.99355,290.90402 300.99355,290.90402 v 53.71686 h 250.0892 v -49.88069 c 0,-360.18252 -215.1939,-554.41347 -551.08275,-554.41347"
+       id="path11"
+       transform="translate(105.79991,94.754269)" /><path
+       style="display:inline;fill:#ffffff;fill-opacity:1;stroke:#ffffff;stroke-width:100;stroke-linecap:round;stroke-linejoin:round;stroke-dasharray:none;stroke-opacity:1"
+       d="m 518.76403,935.53088 v 94.24322 H 268.6748 v -94.24322 z m 601.98707,0 v 94.24322 h 250.0892 v -94.24322 z"
+       id="path8"
+       transform="translate(105.79991,94.754269)" /></g></svg>
--- a/scripts/startup/bl_ui/space_dopesheet.py
+++ b/scripts/startup/bl_ui/space_dopesheet.py
@@ -285,7 +285,10 @@ class DOPESHEET_HT_editor_buttons:
                text="",
            )

-        layout.popover(panel="DOPESHEET_PT_playhead_snapping")
+        row = layout.row(align=True)
+        row.prop(tool_settings, "use_snap_playhead", text="")
+        sub = row.row(align=True)
+        sub.popover(panel="DOPESHEET_PT_playhead_snapping", text="")

        row = layout.row(align=True)
        row.prop(tool_settings, "use_proportional_action", text="", icon_only=True)
--- a/scripts/startup/bl_ui/space_graph.py
+++ b/scripts/startup/bl_ui/space_graph.py
@@ -94,7 +94,11 @@ class GRAPH_HT_header(Header):
                panel="GRAPH_PT_snapping",
                text="",
            )
-            layout.popover(panel="GRAPH_PT_playhead_snapping")
+
+            row = layout.row(align=True)
+            row.prop(tool_settings, "use_snap_playhead", text="")
+            sub = row.row(align=True)
+            sub.popover(panel="GRAPH_PT_playhead_snapping", text="")

        row = layout.row(align=True)
        row.prop(tool_settings, "use_proportional_fcurve", text="", icon_only=True)
--- a/scripts/startup/bl_ui/space_nla.py
+++ b/scripts/startup/bl_ui/space_nla.py
@@ -47,7 +47,11 @@ class NLA_HT_header(Header):
            panel="NLA_PT_snapping",
            text="",
        )
-        layout.popover(panel="NLA_PT_playhead_snapping")
+
+        row = layout.row(align=True)
+        row.prop(tool_settings, "use_snap_playhead", text="")
+        sub = row.row(align=True)
+        sub.popover(panel="NLA_PT_playhead_snapping", text="")


 class NLA_HT_playback_controls(Header):
--- a/scripts/startup/bl_ui/space_sequencer.py
+++ b/scripts/startup/bl_ui/space_sequencer.py
@@ -192,7 +192,10 @@ class SEQUENCER_HT_header(Header):
        sub = row.row(align=True)
        sub.popover(panel="SEQUENCER_PT_snapping")
        if st.view_type in {'SEQUENCER', 'SEQUENCER_PREVIEW'}:
-            layout.popover(panel="SEQUENCER_PT_playhead_snapping")
+            row = layout.row(align=True)
+            row.prop(tool_settings, "use_snap_playhead", text="")
+            sub = row.row(align=True)
+            sub.popover(panel="SEQUENCER_PT_playhead_snapping", text="")
        layout.separator_spacer()

        if st.view_type in {'PREVIEW', 'SEQUENCER_PREVIEW'}:
--- a/scripts/startup/bl_ui/utils.py
+++ b/scripts/startup/bl_ui/utils.py
@@ -54,7 +54,6 @@ class PlayheadSnappingPanel:
        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")
--- a/source/blender/editors/datafiles/CMakeLists.txt
+++ b/source/blender/editors/datafiles/CMakeLists.txt
@@ -723,6 +723,8 @@ if(WITH_BLENDER)
      play
      play_reverse
      play_sound
+      playhead_snap_off
+      playhead_snap_on
      plugin
      plus
      pmarker
--- a/source/blender/editors/include/UI_icons.hh
+++ b/source/blender/editors/include/UI_icons.hh
@@ -86,6 +86,8 @@ DEF_ICON(SELECT_INTERSECT)
 DEF_ICON(SELECT_DIFFERENCE)
 DEF_ICON(SNAP_OFF)
 DEF_ICON(SNAP_ON)
+DEF_ICON(PLAYHEAD_SNAP_OFF)
+DEF_ICON(PLAYHEAD_SNAP_ON)
 DEF_ICON(UNLOCKED)
 DEF_ICON(LOCKED)
 DEF_ICON(VIS_SEL_11)
--- a/source/blender/makesrna/intern/rna_scene.cc
+++ b/source/blender/makesrna/intern/rna_scene.cc
@@ -3756,6 +3756,7 @@ static void rna_def_tool_settings(BlenderRNA *brna)

  prop = RNA_def_property(srna, "use_snap_playhead", PROP_BOOLEAN, PROP_NONE);
  RNA_def_property_boolean_sdna(prop, nullptr, "snap_flag_playhead", SCE_SNAP);
+  RNA_def_property_ui_icon(prop, ICON_PLAYHEAD_SNAP_OFF, 1);
  RNA_def_property_flag(prop, PROP_DEG_SYNC_ONLY);
  RNA_def_property_ui_text(prop, "Use Snapping", "Snap playhead when scrubbing");
  RNA_def_property_boolean_default(prop, false);