summaryrefslogtreecommitdiff
path: root/main
diff options
context:
space:
mode:
authorJuan Linietsky <reduzio@gmail.com>2015-06-13 22:12:53 -0300
committerJuan Linietsky <reduzio@gmail.com>2015-06-13 22:12:53 -0300
commit9a58960d288b0c68c34f296dd97d0134fa1e5f02 (patch)
tree7b417d3b99ec4e413fca8f1187bd7417a9482828 /main
parentc845c2a8276c61323416139790962a096a8d956e (diff)
some editor window changes
-ability to make dock position configurable, and it gets saved -editor starts maximized default
Diffstat (limited to 'main')
-rw-r--r--main/main.cpp12
1 files changed, 11 insertions, 1 deletions
diff --git a/main/main.cpp b/main/main.cpp
index a00538a6ae..15f969f466 100644
--- a/main/main.cpp
+++ b/main/main.cpp
@@ -98,6 +98,9 @@ static int video_driver_idx=-1;
static int audio_driver_idx=-1;
static String locale;
+static bool init_maximized=false;
+static int init_screen=-1;
+
static String unescape_cmdline(const String& p_str) {
return p_str.replace("%20"," ");
@@ -384,7 +387,7 @@ Error Main::setup(const char *execpath,int argc, char *argv[],bool p_second_phas
} else if (I->get()=="-e" || I->get()=="-editor") { // fonud editor
editor=true;
-
+ init_maximized=true;
} else if (I->get()=="-nowindow") { // fullscreen
OS::get_singleton()->set_no_window_mode(true);
@@ -789,6 +792,13 @@ Error Main::setup2() {
show_logo=false;
#endif
+ if (init_screen!=-1) {
+ OS::get_singleton()->set_current_screen(init_screen);
+ }
+ if (init_maximized) {
+ OS::get_singleton()->set_window_maximized(true);
+ }
+
if (show_logo) { //boot logo!
String boot_logo_path=GLOBAL_DEF("application/boot_splash",String());
bool boot_logo_scale=GLOBAL_DEF("application/boot_splash_fullsize",true);