diff options
| author | Ton Roosendaal <ton@blender.org> | 2012-12-13 14:58:00 +0400 |
|---|---|---|
| committer | Ton Roosendaal <ton@blender.org> | 2012-12-13 14:58:00 +0400 |
| commit | dfc3685b1f93092a03b156571d640c64eb0ad955 (patch) | |
| tree | d8218ce0ba05208d240efbd1126bda755e344b84 /source/blender/editors | |
| parent | b30c74a5175cfec05b096b6a36801dddea4009d3 (diff) | |
Only LMB clicks in Panel should return "handled" - it accidentally returned it for
mousewheel too.
Previous commit made scrolling in button regions not work.
Diffstat (limited to 'source/blender/editors')
| -rw-r--r-- | source/blender/editors/interface/interface_panel.c | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/source/blender/editors/interface/interface_panel.c b/source/blender/editors/interface/interface_panel.c index f60e4dff23a..3eb4026f0e0 100644 --- a/source/blender/editors/interface/interface_panel.c +++ b/source/blender/editors/interface/interface_panel.c @@ -1157,27 +1157,31 @@ int ui_handler_panel_region(bContext *C, wmEvent *event) if (event->val == KM_PRESS) { - /* all inside clicks should return in break - overlapping/float panels */ - retval = WM_UI_HANDLER_BREAK; - /* open close on header */ if (ELEM(event->type, RETKEY, PADENTER)) { if (inside_header) { ui_handle_panel_header(C, block, mx, my, RETKEY); + retval = WM_UI_HANDLER_BREAK; break; } } else if (event->type == LEFTMOUSE) { + /* all inside clicks should return in break - overlapping/float panels */ + retval = WM_UI_HANDLER_BREAK; + if (inside_header) { if (event->ctrl) panels_collapse_all(sa, ar); ui_handle_panel_header(C, block, mx, my, 0); + retval = WM_UI_HANDLER_BREAK; break; } else if (inside_scale && !(pa->flag & PNL_CLOSED)) { panel_activate_state(C, pa, PANEL_STATE_DRAG_SCALE); + retval = WM_UI_HANDLER_BREAK; break; } + } else if (event->type == ESCKEY) { /*XXX 2.50*/ |