diff options
| author | Mariano Javier Suligoy <marianognu.easyrpg@gmail.com> | 2015-08-30 02:48:45 -0300 |
|---|---|---|
| committer | Mariano Javier Suligoy <marianognu.easyrpg@gmail.com> | 2015-08-30 02:48:45 -0300 |
| commit | c688b55019e485ddf66cd119173016ec6c8bd4e5 (patch) | |
| tree | 8f1d9eac70d8689545a66a378b4937530b42e8a7 /scene/resources/default_theme | |
| parent | a19a653e2cae50f43b8de5d4ba69170c7d2fa800 (diff) | |
| parent | 7bc9846f169a0a65970c64ca3fc2e799eaa8b990 (diff) | |
Merge branch 'master' of https://github.com/okamstudio/godot
# Solved Conflicts:
# tools/editor/property_editor.cpp
# tools/editor/property_editor.h
Diffstat (limited to 'scene/resources/default_theme')
| -rw-r--r-- | scene/resources/default_theme/default_theme.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/scene/resources/default_theme/default_theme.cpp b/scene/resources/default_theme/default_theme.cpp index 3ee4da5974..5a99538a5f 100644 --- a/scene/resources/default_theme/default_theme.cpp +++ b/scene/resources/default_theme/default_theme.cpp @@ -297,7 +297,7 @@ void make_default_theme() { t->set_color("font_color_hover","MenuButton", control_font_color_hover ); t->set_color("font_color_disabled","MenuButton", Color(1,1,1,0.3) ); - t->set_constant("hseparation","MenuButton", 0 ); + t->set_constant("hseparation","MenuButton", 3 ); // CheckBox |