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

Fix stashed full-screens returning to wrong layout

Browse Source 
Steps to reproduce were:
* Maximize area (Shift+Spacebar in 2.7, Ctrl+Spacebar in 2.8)
* Open temp file browser (Ctrl+O)
* Cancel file browser (Esc) - should return to previous full-screen
* Press "Return to Previous" button
The previously maximized area would turn into a file-browser.

Note that the issue will still happen when opening old files saved while
in maximized area full-screen.
This commit is contained in:
Julian Eisel
2019-03-09 16:58:13 +01:00
parent 02a7e875d7
commit 0a28bb1422
2 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
source/blender/editors/screen/area.c
View File

@@ -1729,7 +1729,7 @@ void ED_area_prevspace(bContext *C, ScrArea *sa)
/* no change */
return;
}
sa->flag &= ~AREA_FLAG_STACKED_FULLSCREEN;
sa->flag &= ~(AREA_FLAG_STACKED_FULLSCREEN | AREA_FLAG_TEMP_TYPE);
ED_area_tag_redraw(sa);

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

@@ -1527,7 +1527,8 @@ void ED_screen_restore_temp_type(bContext *C, ScrArea *sa)
if (sa->flag & AREA_FLAG_TEMP_TYPE) {
ED_area_prevspace(C, sa);
sa->flag &= ~AREA_FLAG_TEMP_TYPE;
/* Flag should be cleared now. */
BLI_assert((sa->flag & AREA_FLAG_TEMP_TYPE) == 0);
}
if (sa->full) {