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

Fix T37756: file > open with file selector already open not restoring screen correctly.

Browse Source
This commit is contained in:
Brecht Van Lommel
2014-02-26 19:50:12 +01:00
parent c4eab10e5c
commit 0de1df49e1
1 changed files with 38 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

52
source/blender/windowmanager/intern/wm_event_system.c
View File

@@ -1644,19 +1644,14 @@ static int wm_handler_operator_call(bContext *C, ListBase *handlers, wmEventHand
return WM_HANDLER_BREAK; return WM_HANDLER_BREAK;
} }
/* fileselect handlers are only in the window queue, so it's save to switch screens or area types */ /* fileselect handlers are only in the window queue, so it's safe to switch screens or area types */
static int wm_handler_fileselect_call(bContext *C, ListBase *handlers, wmEventHandler *handler, wmEvent *event) static int wm_handler_fileselect_do(bContext *C, ListBase *handlers, wmEventHandler *handler, int val)
{ {
wmWindowManager *wm = CTX_wm_manager(C); wmWindowManager *wm = CTX_wm_manager(C);
SpaceFile *sfile; SpaceFile *sfile;
int action = WM_HANDLER_CONTINUE; int action = WM_HANDLER_CONTINUE;
if (event->type != EVT_FILESELECT) switch (val) {
return action;
if (handler->op != (wmOperator *)event->customdata)
return action;
switch (event->val) {
case EVT_FILESELECT_OPEN: case EVT_FILESELECT_OPEN:
case EVT_FILESELECT_FULL_OPEN: case EVT_FILESELECT_FULL_OPEN:
{ {
@@ -1672,7 +1667,7 @@ static int wm_handler_fileselect_call(bContext *C, ListBase *handlers, wmEventHa
sa = handler->op_area; sa = handler->op_area;
} }
if (event->val == EVT_FILESELECT_OPEN) { if (val == EVT_FILESELECT_OPEN) {
ED_area_newspace(C, sa, SPACE_FILE); /* 'sa' is modified in-place */ ED_area_newspace(C, sa, SPACE_FILE); /* 'sa' is modified in-place */
} }
else { else {
@@ -1703,7 +1698,7 @@ static int wm_handler_fileselect_call(bContext *C, ListBase *handlers, wmEventHa
/* remlink now, for load file case before removing*/ /* remlink now, for load file case before removing*/
BLI_remlink(handlers, handler); BLI_remlink(handlers, handler);
if (event->val != EVT_FILESELECT_EXTERNAL_CANCEL) { if (val != EVT_FILESELECT_EXTERNAL_CANCEL) {
if (screen != handler->filescreen) { if (screen != handler->filescreen) {
ED_screen_full_prevspace(C, CTX_wm_area(C)); ED_screen_full_prevspace(C, CTX_wm_area(C));
} }
@@ -1716,7 +1711,7 @@ static int wm_handler_fileselect_call(bContext *C, ListBase *handlers, wmEventHa
/* needed for uiPupMenuReports */ /* needed for uiPupMenuReports */
if (event->val == EVT_FILESELECT_EXEC) { if (val == EVT_FILESELECT_EXEC) {
int retval; int retval;
if (handler->op->type->flag & OPTYPE_UNDO) if (handler->op->type->flag & OPTYPE_UNDO)
@@ -1793,6 +1788,18 @@ static int wm_handler_fileselect_call(bContext *C, ListBase *handlers, wmEventHa
return action; return action;
} }
static int wm_handler_fileselect_call(bContext *C, ListBase *handlers, wmEventHandler *handler, wmEvent *event)
{
int action = WM_HANDLER_CONTINUE;
if (event->type != EVT_FILESELECT)
return action;
if (handler->op != (wmOperator *)event->customdata)
return action;
return wm_handler_fileselect_do(C, handlers, handler, event->val);
}
static bool handler_boundbox_test(wmEventHandler *handler, wmEvent *event) static bool handler_boundbox_test(wmEventHandler *handler, wmEvent *event)
{ {
if (handler->bbwin) { if (handler->bbwin) {
@@ -2409,10 +2416,25 @@ void WM_event_add_fileselect(bContext *C, wmOperator *op)
handlernext = handler->next; handlernext = handler->next;
if (handler->type == WM_HANDLER_FILESELECT) { if (handler->type == WM_HANDLER_FILESELECT) {
if (handler->op) bScreen *screen = CTX_wm_screen(C);
WM_operator_free(handler->op); ScrArea *sa;
BLI_remlink(&win->modalhandlers, handler);
wm_event_free_handler(handler); /* find the area with the file selector for this handler */
for (sa = screen->areabase.first; sa; sa = sa->next) {
if (sa->spacetype == SPACE_FILE) {
SpaceFile *sfile = sa->spacedata.first;
if (sfile->op == handler->op) {
CTX_wm_area_set(C, sa);
wm_handler_fileselect_do(C, &win->modalhandlers, handler, EVT_FILESELECT_CANCEL);
break;
}
}
}
/* if not found we stop the handler without changing the screen */
if (!sa)
wm_handler_fileselect_do(C, &win->modalhandlers, handler, EVT_FILESELECT_EXTERNAL_CANCEL);
} }
} }