diff options
| -rw-r--r-- | main/main.cpp | 3 | ||||
| -rw-r--r-- | platform/windows/os_windows.cpp | 4 |
2 files changed, 7 insertions, 0 deletions
diff --git a/main/main.cpp b/main/main.cpp index 7d19c2ebcf..323250fe11 100644 --- a/main/main.cpp +++ b/main/main.cpp @@ -577,12 +577,15 @@ Error Main::setup(const char *execpath,int argc, char *argv[],bool p_second_phas video_mode.height=globals->get("display/height"); if (use_custom_res && globals->has("display/fullscreen")) video_mode.fullscreen=globals->get("display/fullscreen"); + if (use_custom_res && globals->has("display/resizable")) + video_mode.resizable=globals->get("display/resizable"); GLOBAL_DEF("display/width",video_mode.width); GLOBAL_DEF("display/height",video_mode.height); GLOBAL_DEF("display/fullscreen",video_mode.fullscreen); + GLOBAL_DEF("display/resizable",video_mode.resizable); if (rtm==-1) { rtm=GLOBAL_DEF("render/thread_model",OS::RENDER_THREAD_SAFE); } diff --git a/platform/windows/os_windows.cpp b/platform/windows/os_windows.cpp index 801bb9332a..9871ecba8b 100644 --- a/platform/windows/os_windows.cpp +++ b/platform/windows/os_windows.cpp @@ -888,6 +888,10 @@ void OS_Windows::initialize(const VideoMode& p_desired,int p_video_driver,int p_ } else { dwExStyle=WS_EX_APPWINDOW | WS_EX_WINDOWEDGE; dwStyle=WS_OVERLAPPEDWINDOW; + if (!video_mode.resizable) { + dwStyle &= ~WS_THICKFRAME; + dwStyle &= ~WS_MAXIMIZEBOX; + } } AdjustWindowRectEx(&WindowRect, dwStyle, FALSE, dwExStyle); |