diff options
author | Ton Roosendaal <ton@blender.org> | 2011-04-02 18:11:13 +0400 |
---|---|---|
committer | Ton Roosendaal <ton@blender.org> | 2011-04-02 18:11:13 +0400 |
commit | 89dea61c174e0dbb871385a2e9bf3eab5a4d4df3 (patch) | |
tree | c3a484d5d89e1c89f00c4f8157bfad3e15b0ed93 /source/blender/editors/screen | |
parent | 6a841ef3a1210a9a102b6bbf7ae107e0e7a38d9e (diff) |
Bugfix #26731
Hotkey operator "Toggle full screen layout" restored previous layout
wrongly when mouse in was top header.
Diffstat (limited to 'source/blender/editors/screen')
-rw-r--r-- | source/blender/editors/screen/screen_ops.c | 13 |
1 files changed, 12 insertions, 1 deletions
diff --git a/source/blender/editors/screen/screen_ops.c b/source/blender/editors/screen/screen_ops.c index bff92df430c..02b25562545 100644 --- a/source/blender/editors/screen/screen_ops.c +++ b/source/blender/editors/screen/screen_ops.c @@ -1918,7 +1918,18 @@ static void SCREEN_OT_screen_set(wmOperatorType *ot) /* function to be called outside UI context, or for redo */ static int screen_full_area_exec(bContext *C, wmOperator *UNUSED(op)) { - ED_screen_full_toggle(C, CTX_wm_window(C), CTX_wm_area(C)); + bScreen *screen = CTX_wm_screen(C); + ScrArea *sa=NULL; + + /* search current screen for 'fullscreen' areas */ + /* prevents restoring info header, when mouse is over it */ + for (sa=screen->areabase.first; sa; sa=sa->next) { + if (sa->full) break; + } + + if(sa==NULL) sa= CTX_wm_area(C); + + ED_screen_full_toggle(C, CTX_wm_window(C), sa); return OPERATOR_FINISHED; } |