diff options
| author | Rémi Verschelde <rverschelde@gmail.com> | 2017-04-20 02:10:55 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-04-20 02:10:55 +0200 |
| commit | c88f56be643c8635b3f9284b9e48a96be63bbc46 (patch) | |
| tree | 9aa750fa8f401bae8d956ece8eddf51273d4a069 /scene/resources/default_theme | |
| parent | 367f21e12382ddc9448bb36ed7fb12a14bc4dc16 (diff) | |
| parent | 75f684bc1711b255cde6694988f616aebd94421c (diff) | |
Merge pull request #8376 from RayKoopa/fix_stylebox_expand_margin
Respect the expand margin for StyleBoxTextures again.
Diffstat (limited to 'scene/resources/default_theme')
| -rw-r--r-- | scene/resources/default_theme/default_theme.cpp | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/scene/resources/default_theme/default_theme.cpp b/scene/resources/default_theme/default_theme.cpp index d7c44e0363..3a824a56a3 100644 --- a/scene/resources/default_theme/default_theme.cpp +++ b/scene/resources/default_theme/default_theme.cpp @@ -532,10 +532,8 @@ void fill_default_theme(Ref<Theme> &t, const Ref<Font> &default_font, const Ref< // WindowDialog - Ref<StyleBoxTexture> style_pp_win = sb_expand(make_stylebox(popup_window_png, 10, 26, 10, 8), 8, 24, 8, 6); - t->set_stylebox("panel", "WindowDialog", style_pp_win); - t->set_constant("titlebar_height", "WindowDialog", 20 * scale); - t->set_constant("scaleborder_size", "WindowDialog", 4); + t->set_stylebox("panel", "WindowDialog", sb_expand(make_stylebox(popup_window_png, 10, 26, 10, 8), 8, 24, 8, 6)); + t->set_constant("scaleborder_size", "WindowDialog", 4 * scale); t->set_font("title_font", "WindowDialog", large_font); t->set_color("title_color", "WindowDialog", Color(0, 0, 0)); |