diff options
| author | D.J. Capelis <blender@capelis.dj> | 2007-04-12 10:21:31 +0400 |
|---|---|---|
| committer | D.J. Capelis <blender@capelis.dj> | 2007-04-12 10:21:31 +0400 |
| commit | 7470e7efa0514e7b9204a1afdc9082ff202289e1 (patch) | |
| tree | 7dc851e643c75216396ed61b80d4c88c5771a6be /source/blender/src/ghostwinlay.c | |
| parent | 1e5bdbcb2f872d4a55dc6bab7908489001f2ad88 (diff) | |
Applying consistent default window behavior across platforms.
Now all windows open in a border as opposed to fullscreen. blender -W restores
old functionality, blender -w is now default. This lets each platform's window
manager deal with it's own issues.
As per issue 6391 in the patch tracker.
Diffstat (limited to 'source/blender/src/ghostwinlay.c')
| -rw-r--r-- | source/blender/src/ghostwinlay.c | 18 |
1 files changed, 5 insertions, 13 deletions
diff --git a/source/blender/src/ghostwinlay.c b/source/blender/src/ghostwinlay.c index a19ce2c6b7e..4a76d2d292f 100644 --- a/source/blender/src/ghostwinlay.c +++ b/source/blender/src/ghostwinlay.c @@ -338,21 +338,13 @@ Window *window_open(char *title, int posx, int posy, int sizex, int sizey, int s winlay_get_screensize(&scr_w, &scr_h); posy= (scr_h-posy-sizey); - /* create a fullscreen window on unix by default*/ -#if !defined(WIN32) && !defined(__APPLE__) - inital_state= start_maximized? - GHOST_kWindowStateFullScreen:GHOST_kWindowStateNormal; -#else -#ifdef _WIN32 // FULLSCREEN -// if (start_maximized == G_WINDOWSTATE_FULLSCREEN) -// inital_state= GHOST_kWindowStateFullScreen; -// else - inital_state= start_maximized?GHOST_kWindowStateMaximized:GHOST_kWindowStateNormal; -#else // APPLE - inital_state= start_maximized?GHOST_kWindowStateMaximized:GHOST_kWindowStateNormal; + if (start_maximized == G_WINDOWSTATE_FULLSCREEN) + inital_state = start_maximized?GHOST_kWindowStateFullScreen:GHOST_kWindowStateNormal; + else + inital_state = start_maximized?GHOST_kWindowStateMaximized:GHOST_kWindowStateNormal; +#ifdef __APPLE__ inital_state += macPrefState; #endif -#endif ghostwin= GHOST_CreateWindow(g_system, title, |