archive/blender-archive
Archived
1
1
Fork 0
Code Pull Requests Packages Activity

Fix T70048: Assert when cancelling Append window

Browse Source 
If the file browser was opened from an existing file browser editor
(using File -> Append would make the mouse hover the file browser in the
 Shading workspace), we need special handling for closing the fullscreen
area.
This change brings back the old way of handling fullscreen closing.
This commit is contained in:
Julian Eisel
2019-09-19 20:18:53 +02:00
parent 3791d7abfd
commit 4a5af65fe9
1 changed files with 16 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
source/blender/editors/screen/screen_edit.c
View File

@@ -1371,9 +1371,23 @@ ScrArea *ED_screen_temp_space_open(bContext *C,
sa = CTX_wm_area(C);
}
break;
case USER_TEMP_SPACE_DISPLAY_FULLSCREEN:
sa = ED_screen_full_newspace(C, CTX_wm_area(C), (int)space_type);
case USER_TEMP_SPACE_DISPLAY_FULLSCREEN: {
ScrArea *ctx_sa = CTX_wm_area(C);
if (ctx_sa->full) {
sa = ctx_sa;
ED_area_newspace(C, ctx_sa, space_type, true);
/* we already had a fullscreen here -> mark new space as a stacked fullscreen */
sa->flag |= (AREA_FLAG_STACKED_FULLSCREEN | AREA_FLAG_TEMP_TYPE);
}
else if (ctx_sa->spacetype == space_type) {
sa = ED_screen_state_toggle(C, CTX_wm_window(C), ctx_sa, SCREENMAXIMIZED);
}
else {
sa = ED_screen_full_newspace(C, ctx_sa, (int)space_type);
}
break;
}
}
return sa;