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

Fix another fullscreen toggle glitch

Browse Source 
Steps to reproduce were: Set 3DView to fullscreen->render->toggle out of
fullscreen->escape->Area doesn't change back to 3DView
This commit is contained in:
Julian Eisel
2015-05-28 19:48:28 +02:00
parent 18208c8ad9
commit 23c7d14afd
1 changed files with 7 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
source/blender/editors/render/render_view.c
View File

@@ -245,6 +245,11 @@ static int render_view_cancel_exec(bContext *C, wmOperator *UNUSED(op))
ScrArea *sa = CTX_wm_area(C);
SpaceImage *sima = sa->spacedata.first;
/* ensure image editor fullscreen and area fullscreen states are in sync */
if ((sima->flag & SI_FULLWINDOW) && !sa->full) {
sima->flag &= ~SI_FULLWINDOW;
}
/* test if we have a temp screen in front */
if (win->screen->temp) {
wm_window_lower(win);
@@ -258,8 +263,9 @@ static int render_view_cancel_exec(bContext *C, wmOperator *UNUSED(op))
sima->flag &= ~SI_FULLWINDOW;
ED_screen_full_prevspace(C, sa);
}
else
else {
ED_area_prevspace(C, sa);
}
return OPERATOR_FINISHED;
}