diff options
| author | Ovnuniarchos <pujalte.jorge@gmail.com> | 2015-07-26 20:16:38 +0200 |
|---|---|---|
| committer | Ovnuniarchos <pujalte.jorge@gmail.com> | 2015-07-26 20:16:38 +0200 |
| commit | af132adf94da56ff231ce6f69f8098666cf7d9b0 (patch) | |
| tree | d40e6ad16b9907fb9ad134f3189035a9f85113b8 /scene/resources | |
| parent | d1a260c9660e98da2f8a0ba4af2dd2cde6aeb311 (diff) | |
| parent | 07c99e11f5939699fefa10fab0b898ddc9246f85 (diff) | |
Merge remote-tracking branch 'refs/remotes/origin/master'
Diffstat (limited to 'scene/resources')
| -rw-r--r-- | scene/resources/default_theme/default_theme.cpp | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/scene/resources/default_theme/default_theme.cpp b/scene/resources/default_theme/default_theme.cpp index 9a9048e3e5..cd0e67f04d 100644 --- a/scene/resources/default_theme/default_theme.cpp +++ b/scene/resources/default_theme/default_theme.cpp @@ -250,7 +250,6 @@ void make_default_theme() { t->set_stylebox("hover","ToolButton", make_stylebox( button_normal_png,4,4,4,4) ); t->set_stylebox("disabled","ToolButton", make_empty_stylebox(4,4,4,4) ); t->set_stylebox("focus","ToolButton", focus ); - t->set_font("font","ToolButton", default_font ); t->set_color("font_color","ToolButton", control_font_color ); @@ -676,6 +675,9 @@ void make_default_theme() { t->set_stylebox("tab_fg","Tabs", make_stylebox( tab_current_png,4,4,4,4,16,4,16,4) ); t->set_stylebox("tab_bg","Tabs", make_stylebox( tab_behind_png,4,4,4,4,16,6,16,4) ); t->set_stylebox("panel","Tabs", make_stylebox( tab_container_bg_png,4,4,4,4) ); + t->set_stylebox("button_pressed","Tabs", make_stylebox( button_pressed_png,4,4,4,4) ); + t->set_stylebox("button","Tabs", make_stylebox( button_normal_png,4,4,4,4) ); + t->set_font("font","Tabs", default_font ); |