diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2018-10-18 04:30:23 +0300 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2018-10-18 04:36:39 +0300 |
| commit | 678c2003097d4a5f2def4e8a6f014420ad609d6e (patch) | |
| tree | 26ebb486f80289bcb7384772dc3db3bbc2f67239 /release | |
| parent | 4c1250570bb0cb5db00a8b739482ed0cab948a47 (diff) | |
Gizmo: remove 'Click Anywhere' option
Having an invisible gizmo caused event handling problems (see: T56603).
This is hard to avoid since gizmos are similar to buttons in the way
they have priority over the regular keymap.
Transform events use tweak so events to fall though to the general
view 3d keymap (for cursor placement for eg).
Diffstat (limited to 'release')
| -rw-r--r-- | release/scripts/startup/bl_ui/space_toolsystem_toolbar.py | 34 |
1 files changed, 9 insertions, 25 deletions
diff --git a/release/scripts/startup/bl_ui/space_toolsystem_toolbar.py b/release/scripts/startup/bl_ui/space_toolsystem_toolbar.py index 435eff24fcf..5b5e90609c9 100644 --- a/release/scripts/startup/bl_ui/space_toolsystem_toolbar.py +++ b/release/scripts/startup/bl_ui/space_toolsystem_toolbar.py @@ -320,56 +320,41 @@ class _defs_transform: @ToolDef.from_fn def translate(): - def draw_settings(context, layout, tool): - tool_settings = context.tool_settings - layout.prop(tool_settings, "use_gizmo_apron") return dict( text="Move", # cursor='SCROLL_XY', icon="ops.transform.translate", widget="TRANSFORM_GGT_gizmo", operator="transform.translate", - # TODO, implement as optional fallback gizmo - # keymap=( - # ("transform.translate", dict(release_confirm=True), dict(type='EVT_TWEAK_A', value='ANY')), - # ), - draw_settings=draw_settings, + keymap=( + ("transform.translate", dict(release_confirm=True), dict(type='EVT_TWEAK_A', value='ANY')), + ), ) @ToolDef.from_fn def rotate(): - def draw_settings(context, layout, tool): - tool_settings = context.tool_settings - layout.prop(tool_settings, "use_gizmo_apron") return dict( text="Rotate", # cursor='SCROLL_XY', icon="ops.transform.rotate", widget="TRANSFORM_GGT_gizmo", operator="transform.rotate", - # TODO, implement as optional fallback gizmo - # keymap=( - # ("transform.rotate", dict(release_confirm=True), dict(type='EVT_TWEAK_A', value='ANY')), - # ), - draw_settings=draw_settings, + keymap=( + ("transform.rotate", dict(release_confirm=True), dict(type='EVT_TWEAK_A', value='ANY')), + ), ) @ToolDef.from_fn def scale(): - def draw_settings(context, layout, tool): - tool_settings = context.tool_settings - layout.prop(tool_settings, "use_gizmo_apron") return dict( text="Scale", # cursor='SCROLL_XY', icon="ops.transform.resize", widget="TRANSFORM_GGT_gizmo", operator="transform.resize", - # TODO, implement as optional fallback gizmo - # keymap=( - # ("transform.resize", dict(release_confirm=True), dict(type='EVT_TWEAK_A', value='ANY')), - # ), - draw_settings=draw_settings, + keymap=( + ("transform.resize", dict(release_confirm=True), dict(type='EVT_TWEAK_A', value='ANY')), + ), ) @ToolDef.from_fn @@ -385,7 +370,6 @@ class _defs_transform: def transform(): def draw_settings(context, layout, tool): tool_settings = context.tool_settings - layout.prop(tool_settings, "use_gizmo_apron") layout.prop(tool_settings, "use_gizmo_mode") return dict( text="Transform", |