diff options
author | Campbell Barton <ideasman42@gmail.com> | 2015-01-12 17:40:14 +0300 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2015-01-12 17:44:40 +0300 |
commit | c6d28a94bee211c1d1ce41f364f5c026c4d759f0 (patch) | |
tree | 67d0e83050c410184c47a878f2a113fb4bb3c11b /source/blender/windowmanager/intern | |
parent | 301433fe9d3864a454f0d27b9e3809e8e2c76da6 (diff) |
Fix T42754: File-Selector lost on fullscreen exit
There was a hard-coded check to exit the fileselector when restoring a view.
Now, when space types differ, flag areas as temporary and switch back to the previous type only in this case.
This means you can select a file while having a file-selector space type open, and not loose it every time.
Diffstat (limited to 'source/blender/windowmanager/intern')
-rw-r--r-- | source/blender/windowmanager/intern/wm_event_system.c | 12 |
1 files changed, 4 insertions, 8 deletions
diff --git a/source/blender/windowmanager/intern/wm_event_system.c b/source/blender/windowmanager/intern/wm_event_system.c index e7b3de74a5c..1fc1348385b 100644 --- a/source/blender/windowmanager/intern/wm_event_system.c +++ b/source/blender/windowmanager/intern/wm_event_system.c @@ -1707,16 +1707,12 @@ static int wm_handler_fileselect_do(bContext *C, ListBase *handlers, wmEventHand /* remlink now, for load file case before removing*/ BLI_remlink(handlers, handler); - + if (val != EVT_FILESELECT_EXTERNAL_CANCEL) { - if (screen != handler->filescreen) { - ED_screen_full_prevspace(C, CTX_wm_area(C)); - } - else { - ED_area_prevspace(C, CTX_wm_area(C)); - } + ScrArea *sa = CTX_wm_area(C); + ED_screen_retore_temp_type(C, sa, screen != handler->filescreen); } - + wm_handler_op_context(C, handler); /* needed for UI_popup_menu_reports */ |