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

Popups are now windows also (broken!)

Browse Source
This commit is contained in:
Juan Linietsky
2020-03-12 09:37:40 -03:00
parent 543fb1c4da
commit 441f1a5fe9
159 changed files with 3311 additions and 3285 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
scene/gui/margin_container.cpp
View File

@@ -32,10 +32,10 @@
Size2 MarginContainer::get_minimum_size() const {
int margin_left = get_constant("margin_left");
int margin_top = get_constant("margin_top");
int margin_right = get_constant("margin_right");
int margin_bottom = get_constant("margin_bottom");
int margin_left = get_theme_constant("margin_left");
int margin_top = get_theme_constant("margin_top");
int margin_right = get_theme_constant("margin_right");
int margin_bottom = get_theme_constant("margin_bottom");
Size2 max;
@@ -67,10 +67,10 @@ void MarginContainer::_notification(int p_what) {
switch (p_what) {
case NOTIFICATION_SORT_CHILDREN: {
int margin_left = get_constant("margin_left");
int margin_top = get_constant("margin_top");
int margin_right = get_constant("margin_right");
int margin_bottom = get_constant("margin_bottom");
int margin_left = get_theme_constant("margin_left");
int margin_top = get_theme_constant("margin_top");
int margin_right = get_theme_constant("margin_right");
int margin_bottom = get_theme_constant("margin_bottom");
Size2 s = get_size();