summaryrefslogtreecommitdiff
path: root/scene/gui
diff options
context:
space:
mode:
authorRĂ©mi Verschelde <rverschelde@gmail.com>2017-08-16 18:15:04 +0200
committerGitHub <noreply@github.com>2017-08-16 18:15:04 +0200
commita8a6082dc07e8a00c8a546abf121d82599b1c39a (patch)
treedfddd90190a2e1f3171e97ac0a9e488af1d68ecd /scene/gui
parent5485233549c97c7128fc2026bc2c01d3c1c5b48d (diff)
parent701fb55a108bd83d9a1e6c6bc4bfe61539df333d (diff)
Merge pull request #8899 from toger5/BetterFlatStylebox
Better flat stylebox with rounded corners
Diffstat (limited to 'scene/gui')
-rw-r--r--scene/gui/dialogs.cpp8
1 files changed, 4 insertions, 4 deletions
diff --git a/scene/gui/dialogs.cpp b/scene/gui/dialogs.cpp
index d576ff1dbc..8232a7a466 100644
--- a/scene/gui/dialogs.cpp
+++ b/scene/gui/dialogs.cpp
@@ -67,10 +67,10 @@ void WindowDialog::_fix_size() {
right = panel_texture->get_expand_margin_size(MARGIN_RIGHT);
} else if (panel->get_class() == "StyleBoxFlat") {
Ref<StyleBoxFlat> panel_flat = panel->cast_to<StyleBoxFlat>();
- top = panel_flat->_get_additional_border_size(MARGIN_TOP);
- left = panel_flat->_get_additional_border_size(MARGIN_LEFT);
- bottom = panel_flat->_get_additional_border_size(MARGIN_BOTTOM);
- right = panel_flat->_get_additional_border_size(MARGIN_RIGHT);
+ top = panel_flat->get_expand_margin_size(MARGIN_TOP);
+ left = panel_flat->get_expand_margin_size(MARGIN_LEFT);
+ bottom = panel_flat->get_expand_margin_size(MARGIN_BOTTOM);
+ right = panel_flat->get_expand_margin_size(MARGIN_RIGHT);
}
pos.x = MAX(left, MIN(pos.x, viewport_size.x - size.x - right));