diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2014-01-05 20:00:54 +0400 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2014-01-05 20:00:54 +0400 |
| commit | ca78e402eb351186b03d7456ea27aaf6ddd0e676 (patch) | |
| tree | 600102b1158375734a65094ccb761dd11c0b508a /source/blender/editors/interface | |
| parent | 3027cdd0bac7fc3fc74f30369f2a41d6de15bfd9 (diff) | |
UI: Use shift+lmb for toggling panel pinning (not to conflict with MMB emulation)
Diffstat (limited to 'source/blender/editors/interface')
| -rw-r--r-- | source/blender/editors/interface/interface_handlers.c | 2 | ||||
| -rw-r--r-- | source/blender/editors/interface/interface_panel.c | 12 |
2 files changed, 7 insertions, 7 deletions
diff --git a/source/blender/editors/interface/interface_handlers.c b/source/blender/editors/interface/interface_handlers.c index 634d67e8398..470c042e7c7 100644 --- a/source/blender/editors/interface/interface_handlers.c +++ b/source/blender/editors/interface/interface_handlers.c @@ -5325,7 +5325,7 @@ void ui_panel_menu(bContext *C, ARegion *ar, Panel *pa) pup = uiPupMenuBegin(C, IFACE_("Panel"), ICON_NONE); layout = uiPupMenuLayout(pup); if (UI_panel_category_is_visible(ar)) { - uiItemR(layout, &ptr, "use_pin", 0, "Pin" UI_SEP_CHAR_S "Alt+Left Mouse", ICON_NONE); + uiItemR(layout, &ptr, "use_pin", 0, "Pin" UI_SEP_CHAR_S "Shift+Left Mouse", ICON_NONE); } uiPupMenuEnd(C, pup); } diff --git a/source/blender/editors/interface/interface_panel.c b/source/blender/editors/interface/interface_panel.c index 1ea9e728409..756e7fc3d3a 100644 --- a/source/blender/editors/interface/interface_panel.c +++ b/source/blender/editors/interface/interface_panel.c @@ -1090,7 +1090,7 @@ static void ui_do_drag(const bContext *C, const wmEvent *event, Panel *panel) /* this function is supposed to call general window drawing too */ /* also it supposes a block has panel, and isn't a menu */ -static void ui_handle_panel_header(const bContext *C, uiBlock *block, int mx, int my, int event, short ctrl, short alt) +static void ui_handle_panel_header(const bContext *C, uiBlock *block, int mx, int my, int event, short ctrl, short shift) { ScrArea *sa = CTX_wm_area(C); ARegion *ar = CTX_wm_region(C); @@ -1125,7 +1125,7 @@ static void ui_handle_panel_header(const bContext *C, uiBlock *block, int mx, in button = 1; else if (event == AKEY) button = 1; - else if (ELEM3(event, 0, RETKEY, LEFTMOUSE) && alt) { + else if (ELEM3(event, 0, RETKEY, LEFTMOUSE) && shift) { block->panel->flag ^= PNL_PIN; button = 2; } @@ -1660,10 +1660,10 @@ int ui_handler_panel_region(bContext *C, const wmEvent *event, ARegion *ar) if (pa->flag & PNL_CLOSEDY) { if ((block->rect.ymax <= my) && (block->rect.ymax + PNL_HEADER >= my)) - ui_handle_panel_header(C, block, mx, my, event->type, event->ctrl, event->alt); + ui_handle_panel_header(C, block, mx, my, event->type, event->ctrl, event->shift); } else - ui_handle_panel_header(C, block, mx, my, event->type, event->ctrl, event->alt); + ui_handle_panel_header(C, block, mx, my, event->type, event->ctrl, event->shift); retval = WM_UI_HANDLER_BREAK; continue; @@ -1681,7 +1681,7 @@ int ui_handler_panel_region(bContext *C, const wmEvent *event, ARegion *ar) /* open close on header */ if (ELEM(event->type, RETKEY, PADENTER)) { if (inside_header) { - ui_handle_panel_header(C, block, mx, my, RETKEY, event->ctrl, event->alt); + ui_handle_panel_header(C, block, mx, my, RETKEY, event->ctrl, event->shift); retval = WM_UI_HANDLER_BREAK; break; } @@ -1691,7 +1691,7 @@ int ui_handler_panel_region(bContext *C, const wmEvent *event, ARegion *ar) retval = WM_UI_HANDLER_BREAK; if (inside_header) { - ui_handle_panel_header(C, block, mx, my, 0, event->ctrl, event->alt); + ui_handle_panel_header(C, block, mx, my, 0, event->ctrl, event->shift); retval = WM_UI_HANDLER_BREAK; break; } |