diff options
| author | Rémi Verschelde <remi@verschelde.fr> | 2016-03-12 17:40:56 +0100 |
|---|---|---|
| committer | Rémi Verschelde <remi@verschelde.fr> | 2016-03-12 17:40:56 +0100 |
| commit | 082092267a1ee41600b6d21a42f2d0cfc63e4b3e (patch) | |
| tree | 507901307887e4fb93d86917d79a552e264af042 /main/main.cpp | |
| parent | 8b1dcbfe4d92f9d7273bbd2f1eb805e5c508961a (diff) | |
| parent | 6eb4812317bc5207444ddbfe887d06969969b669 (diff) | |
Merge pull request #3215 from SaracenOne/borderless_windows
Borderless windows
Diffstat (limited to 'main/main.cpp')
| -rw-r--r-- | main/main.cpp | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/main/main.cpp b/main/main.cpp index c12b68cd05..9c98e3780d 100644 --- a/main/main.cpp +++ b/main/main.cpp @@ -691,6 +691,8 @@ Error Main::setup(const char *execpath,int argc, char *argv[],bool p_second_phas video_mode.fullscreen=globals->get("display/fullscreen"); if (use_custom_res && globals->has("display/resizable")) video_mode.resizable=globals->get("display/resizable"); + if (use_custom_res && globals->has("display/borderless_window")) + video_mode.borderless_window = globals->get("display/borderless_window"); if (!force_res && use_custom_res && globals->has("display/test_width") && globals->has("display/test_height")) { int tw = globals->get("display/test_width"); @@ -706,6 +708,7 @@ Error Main::setup(const char *execpath,int argc, char *argv[],bool p_second_phas GLOBAL_DEF("display/height",video_mode.height); GLOBAL_DEF("display/fullscreen",video_mode.fullscreen); GLOBAL_DEF("display/resizable",video_mode.resizable); + GLOBAL_DEF("display/borderless_window", video_mode.borderless_window); GLOBAL_DEF("display/test_width",0); GLOBAL_DEF("display/test_height",0); OS::get_singleton()->_pixel_snap=GLOBAL_DEF("display/use_2d_pixel_snap",false); |