diff options
| author | Ton Roosendaal <ton@blender.org> | 2012-12-20 23:18:46 +0400 |
|---|---|---|
| committer | Ton Roosendaal <ton@blender.org> | 2012-12-20 23:18:46 +0400 |
| commit | e7731cbede93af16a9cd5ceef9f6a222fc3a6772 (patch) | |
| tree | 9a7f38798bb9cb6da3c967273d7f059e9c84b3e2 /source | |
| parent | c5de14ae1ee5f44ff1eda47056ac01040283000f (diff) | |
UI fixes, from the todo:
- Button panel animation didn't work for 3D View properties and similar regions.
- Akey on View3d overlapping panel: was accidentally passed on as event to the main window.
Diffstat (limited to 'source')
| -rw-r--r-- | source/blender/editors/interface/interface_panel.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/source/blender/editors/interface/interface_panel.c b/source/blender/editors/interface/interface_panel.c index bf6b78b63c0..5b6a609e4d2 100644 --- a/source/blender/editors/interface/interface_panel.c +++ b/source/blender/editors/interface/interface_panel.c @@ -133,8 +133,6 @@ static int panels_re_align(ScrArea *sa, ARegion *ar, Panel **r_pa) if (sbuts->re_align || sbuts->mainbo != sbuts->mainb) return 1; } - else if (ar->regiontype == RGN_TYPE_UI) - return 1; else if (sa->spacetype == SPACE_IMAGE && ar->regiontype == RGN_TYPE_PREVIEW) return 1; else if (sa->spacetype == SPACE_FILE && ar->regiontype == RGN_TYPE_CHANNELS) @@ -917,6 +915,7 @@ void uiEndPanels(const bContext *C, ARegion *ar, int *x, int *y) /* re-align, possibly with animation */ if (panels_re_align(sa, ar, &pa)) { + /* XXX code never gets here... PNL_ANIM_ALIGN flag is never set */ if (pa) panel_activate_state(C, pa, PANEL_STATE_ANIMATION); else @@ -1160,6 +1159,7 @@ int ui_handler_panel_region(bContext *C, wmEvent *event) else ui_handle_panel_header(C, block, mx, my, event->type, event->ctrl); + retval = WM_UI_HANDLER_BREAK; continue; } } |