Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorjulianeisel <julian_eisel@web.de>2015-01-25 00:53:22 +0300
committerjulianeisel <julian_eisel@web.de>2015-01-25 01:01:39 +0300
commitf7e844570fea862322b235d31a781f32d4cf04d9 (patch)
treeadd00eee6a5b0f8b62413405fca49d7109d8e9eb /source/blender/editors/screen/screen_edit.c
parent31219415d6c5e9db72b362ac3badff52ea203480 (diff)
Fix T43008: Support stacked fullscreen areas
Diffstat (limited to 'source/blender/editors/screen/screen_edit.c')
-rw-r--r--source/blender/editors/screen/screen_edit.c9
1 files changed, 6 insertions, 3 deletions
diff --git a/source/blender/editors/screen/screen_edit.c b/source/blender/editors/screen/screen_edit.c
index 3972d00293c..c286669da1f 100644
--- a/source/blender/editors/screen/screen_edit.c
+++ b/source/blender/editors/screen/screen_edit.c
@@ -1765,9 +1765,12 @@ void ED_screen_full_prevspace(bContext *C, ScrArea *sa)
wmWindow *win = CTX_wm_window(C);
ED_area_prevspace(C, sa);
-
- if (sa->full)
- ED_screen_state_toggle(C, win, sa, SCREENMAXIMIZED);
+
+ if (sa->full) {
+ /* only toggle out of fullscreen if it wasn't set by the user (for stacked fullscreens) */
+ if (sa->flag & AREA_FLAG_TEMP_TYPE)
+ ED_screen_state_toggle(C, win, sa, SCREENMAXIMIZED);
+ }
}
void ED_screen_retore_temp_type(bContext *C, ScrArea *sa, bool is_screen_change)