godotengine/godot
1
0
Fork 0
mirror of https://github.com/godotengine/godot.git synced 2026-01-06 10:11:57 +03:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #67578 from KoBeWi/GEDITOR

Browse Source 
Unify usage of GLOBAL/EDITOR_GET
This commit is contained in:
Rémi Verschelde
2022-10-31 13:15:58 +01:00
parent 9cfcc9131f e48c5daddf
commit 5947f22be9
113 changed files with 528 additions and 528 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
scene/gui/control.cpp
View File

@@ -633,7 +633,7 @@ Rect2 Control::get_parent_anchorable_rect() const {
#ifdef TOOLS_ENABLED
Node *edited_root = get_tree()->get_edited_scene_root();
if (edited_root && (this == edited_root || edited_root->is_ancestor_of(this))) {
parent_rect.size = Size2(ProjectSettings::get_singleton()->get("display/window/size/viewport_width"), ProjectSettings::get_singleton()->get("display/window/size/viewport_height"));
parent_rect.size = Size2(GLOBAL_GET("display/window/size/viewport_width"), GLOBAL_GET("display/window/size/viewport_height"));
} else {
parent_rect = get_viewport()->get_visible_rect();
}