Fix T54274, and rename option --window-borderless to --window-fullscreen

diff --git a/source/blender/windowmanager/intern/wm_window.c b/source/blender/windowmanager/intern/wm_window.c
index bf3d28e39e0e1db27f9e5dd595761300cb9642ae..ceb51171021a37307502fb7f5271a7b1f1d252b7 100644 (file)
--- a/source/blender/windowmanager/intern/wm_window.c
+++ b/source/blender/windowmanager/intern/wm_window.c
@@ -448,12 +448,7 @@ static void wm_window_ghostwindow_add(wmWindowManager *wm, const char *title, wm
        
        ghostwin = GHOST_CreateWindow(g_system, title,
                                      win->posx, posy, win->sizex, win->sizey,
-#ifdef __APPLE__
-                                     /* we agreed to not set any fullscreen or iconized state on startup */
-                                     GHOST_kWindowStateNormal,
-#else
                                      (GHOST_TWindowState)win->windowstate,
-#endif
                                      GHOST_kDrawingContextTypeOpenGL,
                                      glSettings);
        

diff --git a/source/creator/creator_args.c b/source/creator/creator_args.c
index 45af15817404b4d2ef70d39ad0d1da9a614d88c0..99fa876d64ddd465dccc7cb7cea893337a837d19 100644 (file)
--- a/source/creator/creator_args.c
+++ b/source/creator/creator_args.c
@@ -505,7 +505,7 @@ static int arg_handle_print_help(int UNUSED(argc), const char **UNUSED(argv), vo
        printf("\n");
        printf("Window Options:\n");
        BLI_argsPrintArgDoc(ba, "--window-border");
-       BLI_argsPrintArgDoc(ba, "--window-borderless");
+       BLI_argsPrintArgDoc(ba, "--window-fullscreen");
        BLI_argsPrintArgDoc(ba, "--window-geometry");
        BLI_argsPrintArgDoc(ba, "--start-console");
        BLI_argsPrintArgDoc(ba, "--no-native-pixels");
@@ -972,7 +972,7 @@ static int arg_handle_with_borders(int UNUSED(argc), const char **UNUSED(argv),
 }
 
 static const char arg_handle_without_borders_doc[] =
-"\n\tForce opening without borders."
+"\n\tForce opening in fullscreen mode."
 ;
 static int arg_handle_without_borders(int UNUSED(argc), const char **UNUSED(argv), void *UNUSED(data))
 {
@@ -1892,7 +1892,7 @@ void main_args_setup(bContext *C, bArgs *ba, SYS_SystemHandle *syshandle)
        /* second pass: custom window stuff */
        BLI_argsAdd(ba, 2, "-p", "--window-geometry", CB(arg_handle_window_geometry), NULL);
        BLI_argsAdd(ba, 2, "-w", "--window-border", CB(arg_handle_with_borders), NULL);
-       BLI_argsAdd(ba, 2, "-W", "--window-borderless", CB(arg_handle_without_borders), NULL);
+       BLI_argsAdd(ba, 2, "-W", "--window-fullscreen", CB(arg_handle_without_borders), NULL);
        BLI_argsAdd(ba, 2, "-con", "--start-console", CB(arg_handle_start_with_console), NULL);
        BLI_argsAdd(ba, 2, "-R", NULL, CB(arg_handle_register_extension), NULL);
        BLI_argsAdd(ba, 2, "-r", NULL, CB_EX(arg_handle_register_extension, silent), ba);