diff options
Diffstat (limited to 'source/blender/editors')
-rw-r--r-- | source/blender/editors/interface/interface_region_tooltip.c | 25 | ||||
-rw-r--r-- | source/blender/editors/space_view3d/view3d_gizmo_navigate.c | 26 |
2 files changed, 38 insertions, 13 deletions
diff --git a/source/blender/editors/interface/interface_region_tooltip.c b/source/blender/editors/interface/interface_region_tooltip.c index 5b205de21b8..c47f35c8edd 100644 --- a/source/blender/editors/interface/interface_region_tooltip.c +++ b/source/blender/editors/interface/interface_region_tooltip.c @@ -883,20 +883,25 @@ static uiTooltipData *ui_tooltip_data_from_gizmo(bContext *C, wmGizmo *gz) /* Operator Actions */ { - bool use_drag = gz->drag_part != -1 && gz->highlight_part != gz->drag_part; - const struct { int part; const char *prefix; } gzop_actions[] = { - { - .part = gz->highlight_part, - .prefix = use_drag ? CTX_TIP_(BLT_I18NCONTEXT_OPERATOR_DEFAULT, "Click") : NULL, - }, - { - .part = use_drag ? gz->drag_part : -1, - .prefix = use_drag ? CTX_TIP_(BLT_I18NCONTEXT_OPERATOR_DEFAULT, "Drag") : NULL, - }, +#if 0 + { + .part = gz->highlight_part, + .prefix = use_drag ? CTX_TIP_(BLT_I18NCONTEXT_OPERATOR_DEFAULT, "Click") : NULL, + }, + { + .part = use_drag ? gz->drag_part : -1, + .prefix = use_drag ? CTX_TIP_(BLT_I18NCONTEXT_OPERATOR_DEFAULT, "Drag") : NULL, + }, +#else + { + .part = gz->highlight_part, + .prefix = NULL, + }, +#endif }; for (int i = 0; i < ARRAY_SIZE(gzop_actions); i++) { diff --git a/source/blender/editors/space_view3d/view3d_gizmo_navigate.c b/source/blender/editors/space_view3d/view3d_gizmo_navigate.c index 5af6fd8b04b..ef4d0683818 100644 --- a/source/blender/editors/space_view3d/view3d_gizmo_navigate.c +++ b/source/blender/editors/space_view3d/view3d_gizmo_navigate.c @@ -131,7 +131,7 @@ static bool WIDGETGROUP_navigate_poll(const bContext *C, wmGizmoGroupType *UNUSE return true; } -static void WIDGETGROUP_navigate_setup(const bContext *UNUSED(C), wmGizmoGroup *gzgroup) +static void WIDGETGROUP_navigate_setup(const bContext *C, wmGizmoGroup *gzgroup) { struct NavigateWidgetGroup *navgroup = MEM_callocN(sizeof(struct NavigateWidgetGroup), __func__); @@ -225,14 +225,33 @@ static void WIDGETGROUP_navigate_setup(const bContext *UNUSED(C), wmGizmoGroup * PointerRNA *ptr = WM_gizmo_operator_set(gz, part_index + 1, ot_view_axis, NULL); RNA_enum_set(ptr, "type", mapping[part_index]); } + } - /* When dragging an axis, use this instead. */ - gz->drag_part = 0; + { + wmWindowManager *wm = CTX_wm_manager(C); + wmGizmo *gz = navgroup->gz_array[GZ_INDEX_ROTATE]; + gz->keymap = WM_keymap_ensure( + wm->defaultconf, "Generic Gizmos Click Drag", SPACE_EMPTY, RGN_TYPE_WINDOW); } gzgroup->customdata = navgroup; } +static void WIDGETGROUP_navigate_invoke_prepare(const bContext *UNUSED(C), + wmGizmoGroup *gzgroup, + wmGizmo *gz, + const wmEvent *event) +{ + struct NavigateWidgetGroup *navgroup = gzgroup->customdata; + wmGizmo *gz_rotate = navgroup->gz_array[GZ_INDEX_ROTATE]; + if (gz_rotate == gz) { + if (ISTWEAK(event->type)) { + /* When dragging an axis, use this instead. */ + gz->highlight_part = 0; + } + } +} + static void WIDGETGROUP_navigate_draw_prepare(const bContext *C, wmGizmoGroup *gzgroup) { struct NavigateWidgetGroup *navgroup = gzgroup->customdata; @@ -326,6 +345,7 @@ void VIEW3D_GGT_navigate(wmGizmoGroupType *gzgt) gzgt->poll = WIDGETGROUP_navigate_poll; gzgt->setup = WIDGETGROUP_navigate_setup; + gzgt->invoke_prepare = WIDGETGROUP_navigate_invoke_prepare; gzgt->draw_prepare = WIDGETGROUP_navigate_draw_prepare; } |