diff options
| author | Hein-Pieter van Braam <hp@tmm.cx> | 2018-05-08 16:44:35 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-05-08 16:44:35 +0200 |
| commit | e668757aa9ff4ccd3a90b1f402aba8a424b4c11d (patch) | |
| tree | e569a46b16008d39e541d484fed95ad58ee4068a /main | |
| parent | aacd7f012ebcfb7f8023ebecba2e003fcd018e98 (diff) | |
| parent | ddae098deec89d67228a74623ebe7f5db39f425b (diff) | |
Merge pull request #14622 from bruvzg/non-rectangular-windows
Experimental support for windows with per-pixel transparency.
Diffstat (limited to 'main')
| -rw-r--r-- | main/main.cpp | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/main/main.cpp b/main/main.cpp index 5959deb495..1c5540fd19 100644 --- a/main/main.cpp +++ b/main/main.cpp @@ -875,7 +875,11 @@ Error Main::setup(const char *execpath, int argc, char *argv[], bool p_second_ph OS::get_singleton()->_allow_hidpi = GLOBAL_DEF("display/window/dpi/allow_hidpi", false); } + OS::get_singleton()->_allow_layered = GLOBAL_DEF("display/window/allow_per_pixel_transparency", false); + video_mode.use_vsync = GLOBAL_DEF("display/window/vsync/use_vsync", true); + video_mode.layered = GLOBAL_DEF("display/window/per_pixel_transparency", false); + video_mode.layered_splash = GLOBAL_DEF("display/window/per_pixel_transparency_splash", false); GLOBAL_DEF("rendering/quality/intended_usage/framebuffer_allocation", 2); GLOBAL_DEF("rendering/quality/intended_usage/framebuffer_allocation.mobile", 3); @@ -883,6 +887,7 @@ Error Main::setup(const char *execpath, int argc, char *argv[], bool p_second_ph if (editor || project_manager) { // The editor and project manager always detect and use hiDPI if needed OS::get_singleton()->_allow_hidpi = true; + OS::get_singleton()->_allow_layered = false; } Engine::get_singleton()->_pixel_snap = GLOBAL_DEF("rendering/quality/2d/use_pixel_snap", false); |