godotengine
/
godot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #8620 from Zylann/issue8617_window_dialog_stylebox 

Fix #8617 WindowDialog with custom panel background crashes godot
This commit is contained in:
Rémi Verschelde 2017-05-02 11:24:41 +02:00 committed by GitHub
parent ab9d7241d9 d78efddbf5
commit 28173ad35d
1 changed files with 16 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
scene/gui/dialogs.cpp
View File

@ -54,20 +54,24 @@ void WindowDialog::_fix_size() {
// Windows require additional padding to keep the window chrome visible.
Ref<StyleBoxTexture> panel = get_stylebox("panel", "WindowDialog");
float top = panel->get_expand_margin_size(MARGIN_TOP);
float left = panel->get_expand_margin_size(MARGIN_LEFT);
float bottom = panel->get_expand_margin_size(MARGIN_BOTTOM);
float right = panel->get_expand_margin_size(MARGIN_RIGHT);
pos.x = MAX(left, MIN(pos.x, viewport_size.x - size.x - right));
pos.y = MAX(top, MIN(pos.y, viewport_size.y - size.y - bottom));
set_global_position(pos);
// Check validity, because the theme could contain a different type of StyleBox
if (panel.is_valid()) {
float top = panel->get_expand_margin_size(MARGIN_TOP);
float left = panel->get_expand_margin_size(MARGIN_LEFT);
float bottom = panel->get_expand_margin_size(MARGIN_BOTTOM);
float right = panel->get_expand_margin_size(MARGIN_RIGHT);
// Also resize the window to fit if a resize should be possible at all.
if (resizable) {
size.x = MIN(size.x, viewport_size.x - left - right);
size.y = MIN(size.y, viewport_size.y - top - bottom);
set_size(size);
pos.x = MAX(left, MIN(pos.x, viewport_size.x - size.x - right));
pos.y = MAX(top, MIN(pos.y, viewport_size.y - size.y - bottom));
set_global_position(pos);
// Also resize the window to fit if a resize should be possible at all.
if (resizable) {
size.x = MIN(size.x, viewport_size.x - left - right);
size.y = MIN(size.y, viewport_size.y - top - bottom);
set_size(size);
}
}
}