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/creator | |
| 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/creator')
| -rw-r--r-- | source/creator/creator.c | 19 |
1 files changed, 6 insertions, 13 deletions
diff --git a/source/creator/creator.c b/source/creator/creator.c index 4a9a7a002b0..ec4e4f65813 100644 --- a/source/creator/creator.c +++ b/source/creator/creator.c @@ -195,10 +195,8 @@ static void print_help(void) printf (" -m\t\tRead from disk (Don't buffer)\n"); printf ("\nWindow options:\n"); - printf (" -w\t\tForce opening with borders\n"); -#ifdef WIN32 + printf (" -w\t\tForce opening with borders (default)\n"); printf (" -W\t\tForce opening without borders\n"); -#endif printf (" -p <sx> <sy> <w> <h>\tOpen with lower left corner at <sx>, <sy>\n"); printf (" \tand width and height <w>, <h>\n"); printf ("\nGame Engine specific options:\n"); @@ -391,7 +389,7 @@ int main(int argc, char **argv) /* for all platforms, even windos has it! */ if(G.background) signal(SIGINT, blender_esc); /* ctrl c out bg render */ - /* background render uses this font too */ + /* background render uses this font too */ BKE_font_register_builtin(datatoc_Bfont, datatoc_Bfont_size); init_def_material(); @@ -437,20 +435,15 @@ int main(int argc, char **argv) */ winlay_get_screensize(&sizx, &sizy); setprefsize(0, 0, sizx, sizy); -#if 0 -//#ifdef _WIN32 // FULLSCREEN G.windowstate = G_WINDOWSTATE_BORDER; -#endif break; case 'W': - /* XXX, fixme zr, borderless on win32 */ -#if 0 -//#ifdef _WIN32 // FULLSCREEN + /* XXX, fixme zr, borderless on win32 */ + /* now on all platforms as of 20070411 - DJC */ G.windowstate = G_WINDOWSTATE_FULLSCREEN; -#endif break; case 'R': - /* Registering filetypes only makes sense on windows... */ + /* Registering filetypes only makes sense on windows... */ #ifdef WIN32 RegisterBlendExtension(argv[0]); #endif @@ -461,7 +454,7 @@ int main(int argc, char **argv) /** notify the gameengine that no audio is wanted, even if the user didn't give the flag -g noaudio. - */ + */ SYS_WriteCommandLineInt(syshandle,"noaudio",1); audio = 0; |