2.5

Made ED_screen api calls:
- ED_screen_full_newspace()
- ED_screen_full_prevspace()

Which now gets called by F1 operator, to move to
full-screen-sized browser. For testing fun its default
now. Might become user setting. Also have to check
on opening a temp window for this (and for render).

diff --git a/source/blender/editors/include/ED_screen.h b/source/blender/editors/include/ED_screen.h
index bd9d31288ceb1236e047358f2437968af043f341..a9ad6c545cb666d6304ef4d87652fcd8b3e0e55d 100644 (file)
--- a/source/blender/editors/include/ED_screen.h
+++ b/source/blender/editors/include/ED_screen.h
@@ -80,6 +80,9 @@ bScreen *ED_screen_duplicate(struct wmWindow *win, struct bScreen *sc);
 void   ED_screen_set_subwinactive(struct wmWindow *win, struct wmEvent *event);
 void   ED_screen_exit(struct bContext *C, struct wmWindow *window, struct bScreen *screen);
 void   ED_screen_animation_timer(struct bContext *C, int enable);
+void   ED_screen_full_newspace(struct bContext *C, ScrArea *sa, int type);
+void   ED_screen_full_prevspace(struct bContext *C);
+
 
 void   ED_operatortypes_screen(void);
 void   ED_keymap_screen(struct wmWindowManager *wm);

diff --git a/source/blender/editors/screen/screen_edit.c b/source/blender/editors/screen/screen_edit.c
index f96a84535adb315058646349cb7fd83c8fbd5627..f89ef34e6300af6d0d76ff30258a10f6a23c1769 100644 (file)
--- a/source/blender/editors/screen/screen_edit.c
+++ b/source/blender/editors/screen/screen_edit.c
@@ -1302,6 +1302,24 @@ void ed_screen_fullarea(bContext *C)
 
 }
 
+void ED_screen_full_newspace(bContext *C, ScrArea *sa, int type)
+{
+       if(sa->full==0)
+               ed_screen_fullarea(C);
+
+       ED_area_newspace(C, CTX_wm_area(C), type);
+}
+
+void ED_screen_full_prevspace(bContext *C)
+{
+       ScrArea *sa= CTX_wm_area(C);
+       
+       ED_area_prevspace(C);
+       
+       if(sa->full)
+               ed_screen_fullarea(C);
+}
+
 void ED_screen_animation_timer(bContext *C, int enable)
 {
        bScreen *screen= CTX_wm_screen(C);

diff --git a/source/blender/editors/space_file/file_draw.c b/source/blender/editors/space_file/file_draw.c
index 6f842da6dd042bb2916be77da49d6b638e9985f9..5bf5718f97f55dff31f88b625d436eba7adb7699 100644 (file)
--- a/source/blender/editors/space_file/file_draw.c
+++ b/source/blender/editors/space_file/file_draw.c
@@ -95,7 +95,7 @@ static void do_file_buttons(bContext *C, void *arg, int event)
                        {
                                char name[FILE_MAX];
 
-                               ED_area_prevspace(C);
+                               ED_screen_full_prevspace(C);
                                if(sfile->op) {
                                        wmOperator *op= sfile->op;
                                        
@@ -119,7 +119,7 @@ static void do_file_buttons(bContext *C, void *arg, int event)
                                WM_operator_free(sfile->op);
                                sfile->op = NULL;
                        }
-                       ED_area_prevspace(C);
+                       ED_screen_full_prevspace(C);
                        
                        break;
        }

diff --git a/source/blender/windowmanager/intern/wm_operators.c b/source/blender/windowmanager/intern/wm_operators.c
index a74e6c1d92956d9b7e9f3fac5e5c0e1fcf5adddc..84b2a399392316f9328a5d6dc9712f47d0b136d7 100644 (file)
--- a/source/blender/windowmanager/intern/wm_operators.c
+++ b/source/blender/windowmanager/intern/wm_operators.c
@@ -328,43 +328,9 @@ static void WM_OT_open_recentfile(wmOperatorType *ot)
 
 static int wm_mainfile_invoke(bContext *C, wmOperator *op, wmEvent *event)
 {
-       wmWindow *newwin, *win;
-       bScreen *newsc, *sc;
-       ScrArea *sa, *oldsa;
        SpaceFile *sfile;
-
-       rcti rect;
-       
-       win= CTX_wm_window(C);
-       sc= CTX_wm_screen(C);
-       oldsa= CTX_wm_area(C);
-
-#if 0 /* XXX experimental code for opening filebrowser in new window */
-       /*  poll() checks area context, but we don't accept full-area windows */
-       if(sc->full != SCREENNORMAL) 
-               return OPERATOR_CANCELLED;
-       
-       /* adds window to WM */
-       rect.xmin = 0;
-       rect.ymin = 0;
-       rect.xmax = win->sizex;
-       rect.ymax = win->sizey;
-       BLI_translate_rcti(&rect, win->posx, win->posy);
-       newwin= WM_window_open(C, &rect);
-       
-       /* allocs new screen and adds to newly created window, using window size */
-       newsc= screen_add(newwin, CTX_data_scene(C), sc->id.name+2);
-       newwin->screen= newsc;
-
-       /* create filebrowser */
-       CTX_wm_window_set(C, newwin);
-       CTX_wm_screen_set(C, newsc);
-       sa= (ScrArea*)newsc->areabase.first;
-       CTX_wm_area_set(C, sa);
-       ED_area_newspace(C, sa, SPACE_FILE);
-#else 
-       ED_area_newspace(C, oldsa, SPACE_FILE);
-#endif
+       
+       ED_screen_full_newspace(C, CTX_wm_area(C), SPACE_FILE);
 
        /* settings for filebrowser */
        sfile= (SpaceFile*)CTX_wm_space_data(C);