diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2007-04-17 22:15:31 +0400 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2007-04-17 22:15:31 +0400 |
| commit | 9c8bc4badc9163af4b67b9a1048d29a165dc92d3 (patch) | |
| tree | a16afbe85f14a300de61a0c94d4d5804374fdbbb /source | |
| parent | b95f4ba2ad870568da484eb77138501078a6b76c (diff) | |
Starting blender with -w does not switch of maximize anymore, so with and without the -w arg, the window should start maximized.
Diffstat (limited to 'source')
| -rw-r--r-- | source/blender/include/BIF_screen.h | 2 | ||||
| -rw-r--r-- | source/blender/src/editscreen.c | 4 | ||||
| -rw-r--r-- | source/creator/creator.c | 8 |
3 files changed, 7 insertions, 7 deletions
diff --git a/source/blender/include/BIF_screen.h b/source/blender/include/BIF_screen.h index e97d10b2455..36719af7aa2 100644 --- a/source/blender/include/BIF_screen.h +++ b/source/blender/include/BIF_screen.h @@ -101,7 +101,7 @@ void splash(void * data, int datasizei, char * string); void screen_delayed_undo_push(char *name); void screenmain(void); void getdisplaysize(void); -void setprefsize(int stax, int stay, int sizx, int sizy); +void setprefsize(int stax, int stay, int sizx, int sizy, int maximized); void calc_arearcts(struct ScrArea *sa); void resize_screen(int x, int y, int w, int h); struct ScrArea *closest_bigger_area(void); diff --git a/source/blender/src/editscreen.c b/source/blender/src/editscreen.c index 0d0a301ad24..3a88e568546 100644 --- a/source/blender/src/editscreen.c +++ b/source/blender/src/editscreen.c @@ -1564,7 +1564,7 @@ void mainwindow_set_filename_to_title(char *filename) /* ********* AREAS ************* */ -void setprefsize(int stax, int stay, int sizx, int sizy) +void setprefsize(int stax, int stay, int sizx, int sizy, int maximized) { int scrwidth, scrheight; @@ -1588,7 +1588,7 @@ void setprefsize(int stax, int stay, int sizx, int sizy) prefsizx= sizx; prefsizy= sizy; - start_maximized= 0; + start_maximized= maximized; } diff --git a/source/creator/creator.c b/source/creator/creator.c index ec4e4f65813..a03cacc9beb 100644 --- a/source/creator/creator.c +++ b/source/creator/creator.c @@ -268,13 +268,13 @@ int main(int argc, char **argv) winlay_get_screensize(&scr_x, &scr_y); getMacAvailableBounds(&top, &left, &bottom, &right); - setprefsize(left +10,scr_y - bottom +10,right-left -20,bottom - 64); + setprefsize(left +10,scr_y - bottom +10,right-left -20,bottom - 64, 0); } else { winlay_get_screensize(&scr_x, &scr_y); /* 40 + 684 + (headers) 22 + 22 = 768, the powerbook screen height */ - setprefsize(120, 40, 850, 684); + setprefsize(120, 40, 850, 684, 0); } winlay_process_events(0); @@ -412,7 +412,7 @@ int main(int argc, char **argv) a++; sizy= atoi(argv[a]); - setprefsize(stax, stay, sizx, sizy); + setprefsize(stax, stay, sizx, sizy, 0); break; case 'd': G.f |= G_DEBUG; /* std output printf's */ @@ -434,7 +434,7 @@ int main(int argc, char **argv) * called with "-p 0 0 xres yres" -- sgefant */ winlay_get_screensize(&sizx, &sizy); - setprefsize(0, 0, sizx, sizy); + setprefsize(0, 0, sizx, sizy, 1); G.windowstate = G_WINDOWSTATE_BORDER; break; case 'W': |