mirror/godot
2
0
Fork 0
mirror of https://github.com/godotengine/godot.git synced 2024-11-27 09:16:35 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #29465 from bruvzg/per_pixel_transp_impr

Browse Source 
Removes redundant "splash" setting, improves per pixel transparency documentation.
This commit is contained in:
Rémi Verschelde 2019-06-12 12:50:17 +02:00 committed by GitHub
commit 0e6cac8ab8
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
7 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
core/os/os.h
View File

@ -104,7 +104,6 @@ public:
bool maximized; bool maximized;
bool always_on_top; bool always_on_top;
bool use_vsync; bool use_vsync;
bool layered_splash;
bool layered; bool layered;
float get_aspect() const { return (float)width / (float)height; } float get_aspect() const { return (float)width / (float)height; }
VideoMode(int p_width = 1024, int p_height = 600, bool p_fullscreen = false, bool p_resizable = true, bool p_borderless_window = false, bool p_maximized = false, bool p_always_on_top = false, bool p_use_vsync = false) { VideoMode(int p_width = 1024, int p_height = 600, bool p_fullscreen = false, bool p_resizable = true, bool p_borderless_window = false, bool p_maximized = false, bool p_always_on_top = false, bool p_use_vsync = false) {
@ -117,7 +116,6 @@ public:
always_on_top = p_always_on_top; always_on_top = p_always_on_top;
use_vsync = p_use_vsync; use_vsync = p_use_vsync;
layered = false; layered = false;
layered_splash = false;
} }
}; };

4
doc/classes/OS.xml
View File

@ -818,6 +818,7 @@
</member> </member>
<member name="window_borderless" type="bool" setter="set_borderless_window" getter="get_borderless_window"> <member name="window_borderless" type="bool" setter="set_borderless_window" getter="get_borderless_window">
If [code]true[/code], removes the window frame. If [code]true[/code], removes the window frame.
Note: Setting [code]window_borderless[/code] to [code]false[/code] disables per-pixel transparency.
</member> </member>
<member name="window_fullscreen" type="bool" setter="set_window_fullscreen" getter="is_window_fullscreen"> <member name="window_fullscreen" type="bool" setter="set_window_fullscreen" getter="is_window_fullscreen">
If [code]true[/code], the window is fullscreen. If [code]true[/code], the window is fullscreen.
@ -829,6 +830,9 @@
If [code]true[/code], the window is minimized. If [code]true[/code], the window is minimized.
</member> </member>
<member name="window_per_pixel_transparency_enabled" type="bool" setter="set_window_per_pixel_transparency_enabled" getter="get_window_per_pixel_transparency_enabled"> <member name="window_per_pixel_transparency_enabled" type="bool" setter="set_window_per_pixel_transparency_enabled" getter="get_window_per_pixel_transparency_enabled">
If [code]true[/code], the window background is transparent and window frame is removed.
Use [code]get_tree().get_root().set_transparent_background(true)[/code] to disable main viewport background rendering.
Note: This property has no effect if "Project &gt; Project Settings &gt; Display &gt; Window &gt; Per-pixel transparency &gt; Allowed" setting is disabled.
</member> </member>
<member name="window_position" type="Vector2" setter="set_window_position" getter="get_window_position"> <member name="window_position" type="Vector2" setter="set_window_position" getter="get_window_position">
The window position relative to the screen, the origin is the top left corner, +Y axis goes to the bottom and +X axis goes to the right. The window position relative to the screen, the origin is the top left corner, +Y axis goes to the bottom and +X axis goes to the right.

5
doc/classes/ProjectSettings.xml
View File

@ -374,11 +374,10 @@
Default orientation on mobile devices. Default orientation on mobile devices.
</member> </member>
<member name="display/window/per_pixel_transparency/allowed" type="bool" setter="" getter=""> <member name="display/window/per_pixel_transparency/allowed" type="bool" setter="" getter="">
If [code]true[/code], allows per-pixel transparency in a desktop window. This affects performance if not needed, so leave it on [code]false[/code] unless you need it. If [code]true[/code], allows per-pixel transparency in a desktop window. This affects performance, so leave it on [code]false[/code] unless you need it.
</member> </member>
<member name="display/window/per_pixel_transparency/enabled" type="bool" setter="" getter=""> <member name="display/window/per_pixel_transparency/enabled" type="bool" setter="" getter="">
</member> Set the window background to transparent when it starts.
<member name="display/window/per_pixel_transparency/splash" type="bool" setter="" getter="">
</member> </member>
<member name="display/window/size/always_on_top" type="bool" setter="" getter=""> <member name="display/window/size/always_on_top" type="bool" setter="" getter="">
Force the window to be always on top. Force the window to be always on top.

1
main/main.cpp
View File

@ -939,7 +939,6 @@ Error Main::setup(const char *execpath, int argc, char *argv[], bool p_second_ph
OS::get_singleton()->_allow_layered = GLOBAL_DEF("display/window/per_pixel_transparency/allowed", false); OS::get_singleton()->_allow_layered = GLOBAL_DEF("display/window/per_pixel_transparency/allowed", false);
video_mode.layered = GLOBAL_DEF("display/window/per_pixel_transparency/enabled", false); video_mode.layered = GLOBAL_DEF("display/window/per_pixel_transparency/enabled", 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", 2);
GLOBAL_DEF("rendering/quality/intended_usage/framebuffer_allocation.mobile", 3); GLOBAL_DEF("rendering/quality/intended_usage/framebuffer_allocation.mobile", 3);

2
platform/osx/os_osx.mm
View File

@ -1551,7 +1551,7 @@ Error OS_OSX::initialize(const VideoMode &p_desired, int p_video_driver, int p_a
restore_rect = Rect2(get_window_position(), get_window_size()); restore_rect = Rect2(get_window_position(), get_window_size());
if (p_desired.layered_splash) { if (p_desired.layered) {
set_window_per_pixel_transparency_enabled(true); set_window_per_pixel_transparency_enabled(true);
} }
return OK; return OK;

2
platform/windows/os_windows.cpp
View File

@ -1381,7 +1381,7 @@ Error OS_Windows::initialize(const VideoMode &p_desired, int p_video_driver, int
SetFocus(hWnd); // Sets Keyboard Focus To SetFocus(hWnd); // Sets Keyboard Focus To
} }
if (p_desired.layered_splash) { if (p_desired.layered) {
set_window_per_pixel_transparency_enabled(true); set_window_per_pixel_transparency_enabled(true);
} }

2
platform/x11/os_x11.cpp
View File

@ -593,7 +593,7 @@ Error OS_X11::initialize(const VideoMode &p_desired, int p_video_driver, int p_a
power_manager = memnew(PowerX11); power_manager = memnew(PowerX11);
if (p_desired.layered_splash) { if (p_desired.layered) {
set_window_per_pixel_transparency_enabled(true); set_window_per_pixel_transparency_enabled(true);
} }