[Bf-blender-cvs] [c271a9f] master: Fix T43864: Saving from top area in fullscreen changes wrong area into File Browser

Julian Eisel noreply at git.blender.org
Mon Mar 2 22:39:42 CET 2015


Commit: c271a9fa8bc41eb6b1380aaa84c27c3da5cfb74e
Author: Julian Eisel
Date:   Mon Mar 2 22:35:57 2015 +0100
Branches: master
https://developer.blender.org/rBc271a9fa8bc41eb6b1380aaa84c27c3da5cfb74e

Fix T43864: Saving from top area in fullscreen changes wrong area into File Browser

We now always use the actual fullscreen area.

===================================================================

M	source/blender/windowmanager/intern/wm_event_system.c

===================================================================

diff --git a/source/blender/windowmanager/intern/wm_event_system.c b/source/blender/windowmanager/intern/wm_event_system.c
index 8ddc5d7..e3d9ba4 100644
--- a/source/blender/windowmanager/intern/wm_event_system.c
+++ b/source/blender/windowmanager/intern/wm_event_system.c
@@ -1678,9 +1678,14 @@ static int wm_handler_fileselect_do(bContext *C, ListBase *handlers, wmEventHand
 				sa = handler->op_area;
 			}
 
-			/* we already had a fullscreen here -> mark new space as a stacked fullscreen */
 			if (sa->full) {
+				/* ensure the first area becomes the file browser, because the second one is the small
+				 * top (info-)area which might be too small (in fullscreens we have max two areas) */
+				if (sa->prev) {
+					sa = sa->prev;
+				}
 				ED_area_newspace(C, sa, SPACE_FILE);     /* 'sa' is modified in-place */
+				/* we already had a fullscreen here -> mark new space as a stacked fullscreen */
 				sa->flag |= AREA_FLAG_STACKED_FULLSCREEN;
 			}
 			else {




More information about the Bf-blender-cvs mailing list