diff options
| author | reduz <reduzio@gmail.com> | 2014-04-05 09:39:19 -0300 |
|---|---|---|
| committer | reduz <reduzio@gmail.com> | 2014-04-05 09:39:19 -0300 |
| commit | c1f4d1c95e545ea42d1ff5d9fc226f041e034546 (patch) | |
| tree | 402db5af80a4e5c242fc5aee70b0f21fccb47982 | |
| parent | a643be717036536d0d834d8b6a3244da7769a50b (diff) | |
| parent | f6e6093ab966cd84687e258c7a69dc382f04bc35 (diff) | |
Merge pull request #229 from marynate/PR-resizable-window
Add display/resizable to project setting to prevent windwo from resizing
| -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); |