From 7b9f5e65c9ebb187cf4b7e3ca639ca256915d3d1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ralf=20H=C3=B6lzemer?= Date: Tue, 16 Sep 2014 02:16:26 +0200 Subject: New neutral default theme - desaturated UI elements to grey - desaturated all near-white icons to grey - changed some hardcoded colors --- scene/resources/default_theme/default_theme.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'scene/resources/default_theme/default_theme.cpp') diff --git a/scene/resources/default_theme/default_theme.cpp b/scene/resources/default_theme/default_theme.cpp index e7f0d9b1f5..53c1e62225 100644 --- a/scene/resources/default_theme/default_theme.cpp +++ b/scene/resources/default_theme/default_theme.cpp @@ -179,12 +179,12 @@ void make_default_theme() { t->set_stylebox("panel","Panel", make_stylebox( panel_bg_png,0,0,0,0) ); - Color control_font_color = Color::html("cfc9d5"); - Color control_font_color_low = Color::html("bab4c1"); + Color control_font_color = Color::html("d5d5d5"); + Color control_font_color_low = Color::html("c1c1c1"); Color control_font_color_hover = Color::html("ffffff"); Color control_font_color_disabled = Color(0.9,0.9,0.9,0.6); - Color control_font_color_pressed = Color::html("bfb9c5"); - Color font_color_selection = Color::html("715e7d"); + Color control_font_color_pressed = Color::html("c5c5c5"); + Color font_color_selection = Color::html("7d7d7d"); Ref empty_icon = memnew( ImageTexture ); t->set_stylebox("normal","Button", make_stylebox( button_normal_png,5,5,5,5,8,3,8,4) ); -- cgit v1.2.3 From ae7010888363d6fb9648ef069264328b78ae9047 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ralf=20H=C3=B6lzemer?= Date: Thu, 18 Sep 2014 03:11:49 +0200 Subject: New iteration of the theme - try to implement ndee's mockup from the forum - new color palette - get rid of most gradients probably needs some more tweaks --- scene/resources/default_theme/default_theme.cpp | 121 ++++++++++++------------ 1 file changed, 61 insertions(+), 60 deletions(-) (limited to 'scene/resources/default_theme/default_theme.cpp') diff --git a/scene/resources/default_theme/default_theme.cpp b/scene/resources/default_theme/default_theme.cpp index 53c1e62225..1d34d19dc6 100644 --- a/scene/resources/default_theme/default_theme.cpp +++ b/scene/resources/default_theme/default_theme.cpp @@ -179,18 +179,18 @@ void make_default_theme() { t->set_stylebox("panel","Panel", make_stylebox( panel_bg_png,0,0,0,0) ); - Color control_font_color = Color::html("d5d5d5"); - Color control_font_color_low = Color::html("c1c1c1"); - Color control_font_color_hover = Color::html("ffffff"); - Color control_font_color_disabled = Color(0.9,0.9,0.9,0.6); - Color control_font_color_pressed = Color::html("c5c5c5"); + Color control_font_color = Color::html("e0e0e0"); + Color control_font_color_low = Color::html("b0b0b0"); + Color control_font_color_hover = Color::html("f0f0f0"); + Color control_font_color_disabled = Color(0.9,0.9,0.9,0.2); + Color control_font_color_pressed = Color::html("ffffff"); Color font_color_selection = Color::html("7d7d7d"); Ref empty_icon = memnew( ImageTexture ); - t->set_stylebox("normal","Button", make_stylebox( button_normal_png,5,5,5,5,8,3,8,4) ); - t->set_stylebox("pressed","Button", make_stylebox( button_pressed_png,5,5,5,5,3,3,3,3) ); - t->set_stylebox("hover","Button", make_stylebox( button_hover_png,5,5,5,5,3,0,3,0) ); - t->set_stylebox("disabled","Button", make_stylebox( button_disabled_png,5,5,5,5,3,3,3,3) ); + t->set_stylebox("normal","Button", make_stylebox( button_normal_png,5,5,5,5,16,4,16,4) ); + t->set_stylebox("pressed","Button", make_stylebox( button_pressed_png,5,5,5,5,2,2,2,2) ); + t->set_stylebox("hover","Button", make_stylebox( button_hover_png,5,5,5,5,2,2,2,2) ); + t->set_stylebox("disabled","Button", make_stylebox( button_disabled_png,5,5,5,5,2,2,2,2) ); Ref focus = make_stylebox( focus_png,6,6,6,6,3,3,3,3); for(int i=0;i<4;i++) { focus->set_expand_margin_size(Margin(i),2); @@ -204,36 +204,36 @@ void make_default_theme() { t->set_constant("hseparation","Button", 2 ); - t->set_stylebox("normal","ColorPickerButton", make_stylebox( button_normal_png,7,7,7,7,8,3,8,3) ); - t->set_stylebox("pressed","ColorPickerButton", make_stylebox( button_pressed_png,5,5,5,5,3,3,3,3) ); - t->set_stylebox("hover","ColorPickerButton", make_stylebox( button_hover_png,4,4,4,4,3,3,3,3) ); - t->set_stylebox("disabled","ColorPickerButton", make_stylebox( button_disabled_png,4,4,4,4,3,3,3,3) ); + t->set_stylebox("normal","ColorPickerButton", make_stylebox( button_normal_png,7,7,7,7,4,4,4,4) ); + t->set_stylebox("pressed","ColorPickerButton", make_stylebox( button_pressed_png,5,5,5,5,2,2,2,2) ); + t->set_stylebox("hover","ColorPickerButton", make_stylebox( button_hover_png,4,4,4,4,2,2,2,2) ); + t->set_stylebox("disabled","ColorPickerButton", make_stylebox( button_disabled_png,4,4,4,4,2,2,2,2) ); t->set_stylebox("focus","ColorPickerButton", make_stylebox( focus_png,5,5,5,5,3,3,3,3) ); t->set_font("font","ColorPickerButton", default_font ); t->set_color("font_color","ColorPickerButton", Color(1,1,1,1) ); t->set_color("font_color_pressed","ColorPickerButton", Color(0.8,0.8,0.8,1) ); t->set_color("font_color_hover","ColorPickerButton", Color(1,1,1,1) ); - t->set_color("font_color_disabled","ColorPickerButton", Color(0.9,0.9,0.9,0.6) ); + t->set_color("font_color_disabled","ColorPickerButton", Color(0.9,0.9,0.9,0.3) ); t->set_constant("hseparation","ColorPickerButton", 2 ); - t->set_stylebox("normal","ToolButton", make_empty_stylebox(5,3,5,3) ); - t->set_stylebox("pressed","ToolButton", make_stylebox( button_pressed_png,5,5,5,5,3,3,3,3) ); + t->set_stylebox("normal","ToolButton", make_empty_stylebox(5,5,5,5) ); + t->set_stylebox("pressed","ToolButton", make_stylebox( button_pressed_png,5,5,5,5,4,4,4,4) ); - t->set_stylebox("hover","ToolButton", make_stylebox( button_normal_png,5,5,5,5,3,3,3,3) ); + t->set_stylebox("hover","ToolButton", make_stylebox( button_normal_png,5,5,5,5,4,4,4,4) ); //t->set_stylebox("disabled","ToolButton", make_stylebox( button_disabled_png,5,5,5,5,3,3,3,3) ); - t->set_stylebox("disabled","ToolButton", make_empty_stylebox(3,3,3,3) ); + t->set_stylebox("disabled","ToolButton", make_empty_stylebox(4,4,4,4) ); t->set_stylebox("focus","ToolButton", make_stylebox( focus_png,5,5,5,5,3,3,3,3) ); t->set_font("font","ToolButton", default_font ); t->set_color("font_color","ToolButton", control_font_color ); t->set_color("font_color_pressed","ToolButton", control_font_color_pressed ); t->set_color("font_color_hover","ToolButton", control_font_color_hover ); - t->set_color("font_color_disabled","ToolButton", Color(0.9,0.95,1,0.6) ); + t->set_color("font_color_disabled","ToolButton", Color(0.9,0.95,1,0.3) ); t->set_constant("hseparation","ToolButton", 2 ); - t->set_stylebox("normal","OptionButton", make_stylebox( option_button_normal_png,4,4,20,5,8,3,20,4) ); - t->set_stylebox("pressed","OptionButton", make_stylebox( option_button_pressed_png,4,4,20,5,3,3,3,3) ); - t->set_stylebox("hover","OptionButton", make_stylebox( option_button_hover_png,4,4,20,5,3,3,3,3) ); - t->set_stylebox("disabled","OptionButton", make_stylebox( option_button_disabled_png,4,4,20,5,3,3,3,3) ); + t->set_stylebox("normal","OptionButton", make_stylebox( option_button_normal_png,5,5,21,5,8,3,20,4) ); + t->set_stylebox("pressed","OptionButton", make_stylebox( option_button_pressed_png,5,5,21,5,3,3,3,3) ); + t->set_stylebox("hover","OptionButton", make_stylebox( option_button_hover_png,5,5,21,5,3,3,3,3) ); + t->set_stylebox("disabled","OptionButton", make_stylebox( option_button_disabled_png,5,5,21,5,3,3,3,3) ); t->set_stylebox("focus","OptionButton", focus ); t->set_constant("arrow_margin","OptionButton", 1 ); t->set_icon("arrow","OptionButton", make_icon( option_arrow_png ) ); @@ -246,9 +246,9 @@ void make_default_theme() { t->set_constant("hseparation","OptionButton", 2 ); - t->set_stylebox("normal","MenuButton", make_stylebox( button_normal_png,6,6,6,6,3,3,3,3) ); - t->set_stylebox("pressed","MenuButton", make_stylebox( tool_button_pressed_png ,6,6,6,6,3,3,3,3) ); - t->set_stylebox("hover","MenuButton", make_stylebox( button_normal_png,6,6,6,6,3,3,3,3) ); + t->set_stylebox("normal","MenuButton", make_stylebox( button_normal_png,5,5,5,5,8,4,8,4) ); + t->set_stylebox("pressed","MenuButton", make_stylebox( tool_button_pressed_png ,5,5,5,5,2,2,2,2) ); + t->set_stylebox("hover","MenuButton", make_stylebox( button_normal_png,5,5,5,5,2,2,2,2) ); t->set_stylebox("disabled","MenuButton", make_empty_stylebox(0,0,0,0) ); t->set_font("font","MenuButton", default_font ); t->set_color("font_color","MenuButton", control_font_color ); @@ -275,7 +275,8 @@ void make_default_theme() { t->set_color("font_color_disabled","CheckButton", control_font_color_disabled ); t->set_icon("on","CheckButton", make_icon(toggle_on_png) ); t->set_icon("off","CheckButton", make_icon(toggle_off_png)); - t->set_stylebox("focus","CheckButton", focus ); +// t->set_stylebox("focus","CheckButton", focus ); + t->set_stylebox("focus","CheckButton", make_empty_stylebox(0,0,0,0) ); t->set_constant("hseparation","CheckButton",4); t->set_constant("check_vadjust","CheckButton",0); @@ -287,7 +288,7 @@ void make_default_theme() { t->set_constant("shadow_offset_y","Label", 1 ); t->set_constant("shadow_as_outline","Label", 0 ); - t->set_stylebox("normal","LineEdit", make_stylebox( line_edit_png,4,4,4,4,3,4,3,4) ); + t->set_stylebox("normal","LineEdit", make_stylebox( line_edit_png,4,4,4,4,3,3,3,3) ); t->set_stylebox("focus","LineEdit", focus ); t->set_stylebox("read_only","LineEdit", make_stylebox( line_edit_disabled_png,6,6,6,6,4,4,4,4) ); Image n(line_edit_png); @@ -302,18 +303,18 @@ void make_default_theme() { t->set_color("selection_color","LineEdit", font_color_selection ); t->set_constant("minimum_spaces","LineEdit", 8 ); - t->set_stylebox("bg","ProgressBar", make_stylebox( progress_bar_png,5,5,5,5,0,0,0,0) ); - t->set_stylebox("fg","ProgressBar", make_stylebox( progress_fill_png,5,5,5,5,2,2,2,2) ); + t->set_stylebox("bg","ProgressBar", make_stylebox( progress_bar_png,4,4,4,4,0,0,0,0) ); + t->set_stylebox("fg","ProgressBar", make_stylebox( progress_fill_png,5,5,5,5,3,3,3,3) ); t->set_font("font","ProgressBar", default_font ); - t->set_color("font_color","ProgressBar", control_font_color ); + t->set_color("font_color","ProgressBar", control_font_color_hover ); t->set_color("font_color_shadow","ProgressBar", Color(0,0,0) ); t->set_icon("tab","TextEdit", make_icon( tab_png) ); - t->set_stylebox("normal","TextEdit", make_stylebox( tree_bg_png,12,12,12,12,3,3,3,3) ); + t->set_stylebox("normal","TextEdit", make_stylebox( tree_bg_png,2,2,2,2,3,3,3,3) ); t->set_stylebox("focus","TextEdit", focus ); - t->set_stylebox("completion","TextEdit", make_stylebox( tree_bg_png,4,4,4,5,3,3,3,3) ); + t->set_stylebox("completion","TextEdit", make_stylebox( tree_bg_png,2,2,2,2,3,3,3,3) ); t->set_constant("completion_lines","TextEdit", 7 ); t->set_constant("completion_max_width","TextEdit", 50 ); t->set_constant("completion_scroll_width","TextEdit", 3 ); @@ -327,17 +328,17 @@ void make_default_theme() { t->set_color("font_color_selected","TextEdit", Color(0,0,0) ); t->set_color("selection_color","TextEdit", font_color_selection ); t->set_color("mark_color","TextEdit", Color(1.0,0.4,0.4,0.4) ); - t->set_color("breakpoint_color","TextEdit", Color(0.8,0.8,0.4,0.4) ); - t->set_color("current_line_color","TextEdit", Color(0.3,0.5,0.8,0.15) ); + t->set_color("breakpoint_color","TextEdit", Color(0.8,0.8,0.4,0.2) ); + t->set_color("current_line_color","TextEdit", Color(0.25,0.25,0.26,0.8) ); t->set_color("cursor_color","TextEdit", control_font_color ); t->set_color("symbol_color","TextEdit", control_font_color_hover ); t->set_color("brace_mismatch_color","TextEdit", Color(1,0.2,0.2) ); - t->set_constant("line_spacing","TextEdit",1 ); + t->set_constant("line_spacing","TextEdit",4 ); - t->set_stylebox("scroll","HScrollBar", make_stylebox( hscroll_bg_png,3,3,3,3,0,0,0,0) ); - t->set_stylebox("scroll_focus","HScrollBar", make_stylebox( hscroll_bg_png,3,3,3,3,0,0,0,0) ); - t->set_stylebox("grabber","HScrollBar", make_stylebox( hscroll_grabber_png,3,3,3,3,2,2,2,2) ); - t->set_stylebox("grabber_hilite","HScrollBar", make_stylebox( hscroll_grabber_hl_png,3,3,3,3,2,2,2,2) ); + t->set_stylebox("scroll","HScrollBar", make_stylebox( hscroll_bg_png,3,3,3,3) ); + t->set_stylebox("scroll_focus","HScrollBar", make_stylebox( hscroll_bg_png,3,3,3,3) ); + t->set_stylebox("grabber","HScrollBar", make_stylebox( hscroll_grabber_png,3,3,3,3) ); + t->set_stylebox("grabber_hilite","HScrollBar", make_stylebox( hscroll_grabber_hl_png,3,3,3,3) ); t->set_icon("increment","HScrollBar",empty_icon); t->set_icon("increment_hilite","HScrollBar",empty_icon); @@ -345,10 +346,10 @@ void make_default_theme() { t->set_icon("decrement_hilite","HScrollBar",empty_icon); - t->set_stylebox("scroll","VScrollBar", make_stylebox( vscroll_bg_png,3,3,3,3,0,0,0,0) ); - t->set_stylebox("scroll_focus","VScrollBar", make_stylebox( vscroll_bg_png,3,3,3,3,0,0,0,0) ); - t->set_stylebox("grabber","VScrollBar", make_stylebox( vscroll_grabber_png,3,3,3,3,2,2,2,2) ); - t->set_stylebox("grabber_hilite","VScrollBar", make_stylebox( vscroll_grabber_hl_png,3,3,3,3,2,2,2,2) ); + t->set_stylebox("scroll","VScrollBar", make_stylebox( vscroll_bg_png,3,3,3,3) ); + t->set_stylebox("scroll_focus","VScrollBar", make_stylebox( vscroll_bg_png,3,3,3,3) ); + t->set_stylebox("grabber","VScrollBar", make_stylebox( vscroll_grabber_png,3,3,3,3) ); + t->set_stylebox("grabber_hilite","VScrollBar", make_stylebox( vscroll_grabber_hl_png,3,3,3,3) ); t->set_icon("increment","VScrollBar",empty_icon); t->set_icon("increment_hilite","VScrollBar",empty_icon); t->set_icon("decrement","VScrollBar",empty_icon); @@ -388,7 +389,7 @@ void make_default_theme() { t->set_constant("close_v_ofs","WindowDialog", 20 ); - Ref style_pp = make_stylebox( popup_bg_png,6,19,6,7,8,8,8,8); + Ref style_pp = make_stylebox( popup_bg_png,4,4,4,4,8,8,8,8); style_pp->set_expand_margin_size(MARGIN_LEFT,2); style_pp->set_expand_margin_size(MARGIN_TOP,3); style_pp->set_expand_margin_size(MARGIN_RIGHT,2); @@ -446,10 +447,10 @@ void make_default_theme() { t->set_stylebox("cursor","Tree", focus ); t->set_stylebox("cursor_unfocused","Tree", focus ); - t->set_stylebox("button_pressed","Tree",make_stylebox( button_pressed_png,5,5,5,5,3,3,3,3)); + t->set_stylebox("button_pressed","Tree",make_stylebox( button_pressed_png,4,4,4,4,3,3,3,3)); t->set_font("font","Tree", default_font ); t->set_color("font_color","Tree", control_font_color_low ); - t->set_color("font_color_selected","Tree", control_font_color ); + t->set_color("font_color_selected","Tree", control_font_color_pressed ); t->set_color("selection_color","Tree", Color(0.1,0.1,1,0.8) ); t->set_color("cursor_color","Tree", Color(0,0,0) ); t->set_color("guide_color","Tree", Color(0,0,0,0.1) ); @@ -475,7 +476,7 @@ void make_default_theme() { t->set_stylebox("tab_fg","TabContainer", make_stylebox( tab_current_png,5,5,5,5,8,3,8,3) ); t->set_stylebox("tab_bg","TabContainer", make_stylebox( tab_behind_png,5,5,5,5,8,4,8,3) ); - Ref tc_sb = make_stylebox( tab_container_bg_png,6,19,6,7); + Ref tc_sb = make_stylebox( tab_container_bg_png,4,4,4,4); for(int i=0;i<4;i++) { tc_sb->set_default_margin(Margin(i),7); tc_sb->set_expand_margin_size(Margin(i),2); @@ -491,23 +492,23 @@ void make_default_theme() { t->set_font("font","TabContainer", default_font ); t->set_color("font_color_fg","TabContainer", control_font_color_hover ); - t->set_color("font_color_bg","TabContainer", control_font_color ); + t->set_color("font_color_bg","TabContainer", control_font_color_low ); t->set_constant("side_margin","TabContainer", 5 ); t->set_constant("top_margin","TabContainer", 24); t->set_constant("label_valign_fg","TabContainer", 4); t->set_constant("label_valign_bg","TabContainer", 5); t->set_constant("hseparation","TabContainer", 2); - t->set_stylebox("tab_fg","Tabs", make_stylebox( tab_current_png,5,5,5,5,8,3,8,3) ); - t->set_stylebox("tab_bg","Tabs", make_stylebox( tab_behind_png,5,5,5,5,8,4,8,3) ); - t->set_stylebox("panel","Tabs", make_stylebox( tab_container_bg_png,3,3,3,3) ); + t->set_stylebox("tab_fg","Tabs", make_stylebox( tab_current_png,5,5,5,5,16,3,16,3) ); + t->set_stylebox("tab_bg","Tabs", make_stylebox( tab_behind_png,5,5,5,5,16,4,16,3) ); + t->set_stylebox("panel","Tabs", make_stylebox( tab_container_bg_png,4,4,4,4,6,6,6,6) ); t->set_font("font","Tabs", default_font ); t->set_color("font_color_fg","Tabs", control_font_color_hover ); - t->set_color("font_color_bg","Tabs", control_font_color ); + t->set_color("font_color_bg","Tabs", control_font_color_low ); t->set_constant("top_margin","Tabs", 24); t->set_constant("label_valign_fg","Tabs", 4); t->set_constant("label_valign_bg","Tabs", 5); - t->set_constant("hseparation","Tabs", 2); + t->set_constant("hseparation","Tabs", 0); t->set_stylebox("separator","HSeparator", make_stylebox( vseparator_png,3,3,3,3) ); t->set_constant("separation","HSeparator", 7); @@ -567,25 +568,25 @@ void make_default_theme() { t->set_stylebox("bg","VSplitContainer", make_stylebox( vsplit_bg_png,1,1,1,1,1,1,1,1) ); t->set_stylebox("bg","HSplitContainer", make_stylebox( hsplit_bg_png,1,1,1,1,1,1,1,1) ); - t->set_stylebox("normal","HButtonArray", make_stylebox( button_normal_png,2,2,2,2,3,3,3,3) ); + t->set_stylebox("normal","HButtonArray", make_stylebox( button_normal_png,5,5,5,5,3,3,3,3) ); t->set_stylebox("selected","HButtonArray", make_stylebox( button_pressed_png,5,5,5,5,3,3,3,3) ); t->set_stylebox("hover","HButtonArray", make_stylebox( button_hover_png,5,5,5,5,3,3,3,3) ); t->set_stylebox("focus","HButtonArray", make_stylebox( focus_png,5,5,5,5,3,3,3,3) ); t->set_font("font","HButtonArray", default_font); t->set_font("font_selected","HButtonArray", default_font); - t->set_color("font_color","HButtonArray", Color(1,1,1,1) ); - t->set_color("font_color_selected","HButtonArray", Color(0.7,0.7,0.7,1) ); + t->set_color("font_color","HButtonArray", control_font_color_low ); + t->set_color("font_color_selected","HButtonArray", control_font_color_hover ); t->set_constant("icon_separator","HButtonArray", 2 ); t->set_constant("button_separator","HButtonArray", 3 ); - t->set_stylebox("normal","VButtonArray", make_stylebox( button_normal_png,2,2,2,2,3,3,3,3) ); + t->set_stylebox("normal","VButtonArray", make_stylebox( button_normal_png,5,5,5,5,3,3,3,3) ); t->set_stylebox("selected","VButtonArray", make_stylebox( button_pressed_png,5,5,5,5,3,3,3,3) ); t->set_stylebox("hover","VButtonArray", make_stylebox( button_hover_png,5,5,5,5,3,3,3,3) ); t->set_stylebox("focus","VButtonArray", make_stylebox( focus_png,5,5,5,5,3,3,3,3) ); t->set_font("font","VButtonArray", default_font); t->set_font("font_selected","VButtonArray", default_font); - t->set_color("font_color","VButtonArray", Color(1,1,1,1) ); - t->set_color("font_color_selected","VButtonArray", Color(0.7,0.7,0.7,1) ); + t->set_color("font_color","VButtonArray", control_font_color_low ); + t->set_color("font_color_selected","VButtonArray", control_font_color_hover ); t->set_constant("icon_separator","VButtonArray", 2 ); t->set_constant("button_separator","VButtonArray", 3 ); -- cgit v1.2.3 From df4141867740cde7df88c0956c99ce831a115915 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ralf=20H=C3=B6lzemer?= Date: Sun, 21 Sep 2014 02:06:38 +0200 Subject: More Theme fixes - some color tweaks - many margin fixes - overall nicer look Conflicts: scene/resources/default_theme/default_theme.cpp --- scene/resources/default_theme/default_theme.cpp | 494 ++++++++++++++++-------- 1 file changed, 335 insertions(+), 159 deletions(-) (limited to 'scene/resources/default_theme/default_theme.cpp') diff --git a/scene/resources/default_theme/default_theme.cpp b/scene/resources/default_theme/default_theme.cpp index 1d34d19dc6..47b94e5d6a 100644 --- a/scene/resources/default_theme/default_theme.cpp +++ b/scene/resources/default_theme/default_theme.cpp @@ -168,7 +168,7 @@ void make_default_theme() { tex_cache = memnew( TexCacheMap ); - uint32_t last=OS::get_singleton()->get_ticks_msec(); +// uint32_t last=OS::get_singleton()->get_ticks_msec(); Ref t( memnew( Theme ) ); @@ -177,7 +177,8 @@ void make_default_theme() { Ref source_font=make_font2(_builtin_source_font_height,_builtin_source_font_ascent,_builtin_source_font_charcount,&_builtin_source_font_charrects[0][0],_builtin_source_font_kerning_pair_count,&_builtin_source_font_kerning_pairs[0][0],_builtin_source_font_img_width,_builtin_source_font_img_height,_builtin_source_font_img_data); Ref large_font=make_font2(_builtin_large_font_height,_builtin_large_font_ascent,_builtin_large_font_charcount,&_builtin_large_font_charrects[0][0],_builtin_large_font_kerning_pair_count,&_builtin_large_font_kerning_pairs[0][0],_builtin_large_font_img_width,_builtin_large_font_img_height,_builtin_large_font_img_data); - t->set_stylebox("panel","Panel", make_stylebox( panel_bg_png,0,0,0,0) ); + + // Font Colors Color control_font_color = Color::html("e0e0e0"); Color control_font_color_low = Color::html("b0b0b0"); @@ -185,145 +186,209 @@ void make_default_theme() { Color control_font_color_disabled = Color(0.9,0.9,0.9,0.2); Color control_font_color_pressed = Color::html("ffffff"); Color font_color_selection = Color::html("7d7d7d"); - Ref empty_icon = memnew( ImageTexture ); - t->set_stylebox("normal","Button", make_stylebox( button_normal_png,5,5,5,5,16,4,16,4) ); - t->set_stylebox("pressed","Button", make_stylebox( button_pressed_png,5,5,5,5,2,2,2,2) ); - t->set_stylebox("hover","Button", make_stylebox( button_hover_png,5,5,5,5,2,2,2,2) ); - t->set_stylebox("disabled","Button", make_stylebox( button_disabled_png,5,5,5,5,2,2,2,2) ); - Ref focus = make_stylebox( focus_png,6,6,6,6,3,3,3,3); + + + // Panel + + t->set_stylebox("panel","Panel", make_stylebox( panel_bg_png,0,0,0,0) ); + + + + // Focus + + Ref focus = make_stylebox( focus_png,5,5,5,5); for(int i=0;i<4;i++) { focus->set_expand_margin_size(Margin(i),2); } + + + + // Button + + t->set_stylebox("normal","Button", make_stylebox( button_normal_png,4,4,4,4,16,4,16,4) ); + t->set_stylebox("pressed","Button", make_stylebox( button_pressed_png,4,4,4,4) ); + t->set_stylebox("hover","Button", make_stylebox( button_hover_png,4,4,4,4) ); + t->set_stylebox("disabled","Button", make_stylebox( button_disabled_png,4,4,4,4) ); t->set_stylebox("focus","Button", focus ); + t->set_font("font","Button", default_font ); + t->set_color("font_color","Button", control_font_color ); t->set_color("font_color_pressed","Button", control_font_color_pressed ); t->set_color("font_color_hover","Button", control_font_color_hover ); t->set_color("font_color_disabled","Button", control_font_color_disabled ); - t->set_constant("hseparation","Button", 2 ); + t->set_constant("hseparation","Button", 2); + + + + // ColorPickerButton + + t->set_stylebox("normal","ColorPickerButton", make_stylebox( button_normal_png,4,4,4,4) ); + t->set_stylebox("pressed","ColorPickerButton", make_stylebox( button_pressed_png,4,4,4,4) ); + t->set_stylebox("hover","ColorPickerButton", make_stylebox( button_hover_png,4,4,4,4) ); + t->set_stylebox("disabled","ColorPickerButton", make_stylebox( button_disabled_png,4,4,4,4) ); + t->set_stylebox("focus","ColorPickerButton", focus ); - t->set_stylebox("normal","ColorPickerButton", make_stylebox( button_normal_png,7,7,7,7,4,4,4,4) ); - t->set_stylebox("pressed","ColorPickerButton", make_stylebox( button_pressed_png,5,5,5,5,2,2,2,2) ); - t->set_stylebox("hover","ColorPickerButton", make_stylebox( button_hover_png,4,4,4,4,2,2,2,2) ); - t->set_stylebox("disabled","ColorPickerButton", make_stylebox( button_disabled_png,4,4,4,4,2,2,2,2) ); - t->set_stylebox("focus","ColorPickerButton", make_stylebox( focus_png,5,5,5,5,3,3,3,3) ); t->set_font("font","ColorPickerButton", default_font ); + t->set_color("font_color","ColorPickerButton", Color(1,1,1,1) ); t->set_color("font_color_pressed","ColorPickerButton", Color(0.8,0.8,0.8,1) ); t->set_color("font_color_hover","ColorPickerButton", Color(1,1,1,1) ); t->set_color("font_color_disabled","ColorPickerButton", Color(0.9,0.9,0.9,0.3) ); + t->set_constant("hseparation","ColorPickerButton", 2 ); - t->set_stylebox("normal","ToolButton", make_empty_stylebox(5,5,5,5) ); - t->set_stylebox("pressed","ToolButton", make_stylebox( button_pressed_png,5,5,5,5,4,4,4,4) ); - t->set_stylebox("hover","ToolButton", make_stylebox( button_normal_png,5,5,5,5,4,4,4,4) ); - //t->set_stylebox("disabled","ToolButton", make_stylebox( button_disabled_png,5,5,5,5,3,3,3,3) ); + // ToolButton + + Ref tb_empty = memnew( StyleBoxEmpty ); + tb_empty->set_default_margin(MARGIN_LEFT,8); + tb_empty->set_default_margin(MARGIN_RIGHT,8); + tb_empty->set_default_margin(MARGIN_TOP,4); + tb_empty->set_default_margin(MARGIN_BOTTOM,4); + + t->set_stylebox("normal","ToolButton", tb_empty); + t->set_stylebox("pressed","ToolButton", make_stylebox( button_pressed_png,4,4,4,4) ); + 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", make_stylebox( focus_png,5,5,5,5,3,3,3,3) ); + t->set_stylebox("focus","ToolButton", focus ); + t->set_font("font","ToolButton", default_font ); + t->set_color("font_color","ToolButton", control_font_color ); t->set_color("font_color_pressed","ToolButton", control_font_color_pressed ); t->set_color("font_color_hover","ToolButton", control_font_color_hover ); t->set_color("font_color_disabled","ToolButton", Color(0.9,0.95,1,0.3) ); - t->set_constant("hseparation","ToolButton", 2 ); - t->set_stylebox("normal","OptionButton", make_stylebox( option_button_normal_png,5,5,21,5,8,3,20,4) ); - t->set_stylebox("pressed","OptionButton", make_stylebox( option_button_pressed_png,5,5,21,5,3,3,3,3) ); - t->set_stylebox("hover","OptionButton", make_stylebox( option_button_hover_png,5,5,21,5,3,3,3,3) ); - t->set_stylebox("disabled","OptionButton", make_stylebox( option_button_disabled_png,5,5,21,5,3,3,3,3) ); + t->set_constant("hseparation","ToolButton", 0 ); + + + + // OptionButton + + t->set_stylebox("normal","OptionButton", make_stylebox( option_button_normal_png,5,5,21,5,8,4,8,4) ); + t->set_stylebox("pressed","OptionButton", make_stylebox( option_button_pressed_png,5,5,21,5) ); + t->set_stylebox("hover","OptionButton", make_stylebox( option_button_hover_png,5,5,21,5) ); + t->set_stylebox("disabled","OptionButton", make_stylebox( option_button_disabled_png,5,5,21,5) ); t->set_stylebox("focus","OptionButton", focus ); - t->set_constant("arrow_margin","OptionButton", 1 ); + t->set_icon("arrow","OptionButton", make_icon( option_arrow_png ) ); t->set_font("font","OptionButton", default_font ); + t->set_color("font_color","OptionButton", control_font_color ); t->set_color("font_color_pressed","OptionButton", control_font_color_pressed ); t->set_color("font_color_hover","OptionButton", control_font_color_hover ); t->set_color("font_color_disabled","OptionButton", control_font_color_disabled ); t->set_constant("hseparation","OptionButton", 2 ); + t->set_constant("arrow_margin","OptionButton", 2 ); + + - t->set_stylebox("normal","MenuButton", make_stylebox( button_normal_png,5,5,5,5,8,4,8,4) ); - t->set_stylebox("pressed","MenuButton", make_stylebox( tool_button_pressed_png ,5,5,5,5,2,2,2,2) ); - t->set_stylebox("hover","MenuButton", make_stylebox( button_normal_png,5,5,5,5,2,2,2,2) ); + // MenuButton + + t->set_stylebox("normal","MenuButton", make_stylebox( button_normal_png,4,4,4,4,8,4,8,4) ); + t->set_stylebox("pressed","MenuButton", make_stylebox( tool_button_pressed_png ,4,4,4,4) ); + t->set_stylebox("hover","MenuButton", make_stylebox( button_normal_png,4,4,4,4) ); t->set_stylebox("disabled","MenuButton", make_empty_stylebox(0,0,0,0) ); + t->set_font("font","MenuButton", default_font ); + t->set_color("font_color","MenuButton", control_font_color ); t->set_color("font_color_pressed","MenuButton", control_font_color_pressed ); 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_stylebox("focus","OptionButton", Ref( memnew( StyleBoxEmpty )) ); - t->set_constant("hseparation","MenuButton", 2 ); + t->set_constant("hseparation","MenuButton", 0 ); + + + + // CheckButton Ref cb_empty = memnew( StyleBoxEmpty ); + cb_empty->set_default_margin(MARGIN_LEFT,6); cb_empty->set_default_margin(MARGIN_RIGHT,70); - cb_empty->set_default_margin(MARGIN_TOP,4); - cb_empty->set_default_margin(MARGIN_BOTTOM,4); + cb_empty->set_default_margin(MARGIN_TOP,6); + cb_empty->set_default_margin(MARGIN_BOTTOM,6); + t->set_stylebox("normal","CheckButton", cb_empty ); t->set_stylebox("pressed","CheckButton", cb_empty ); t->set_stylebox("disabled","CheckButton", cb_empty ); t->set_stylebox("hover","CheckButton", cb_empty ); - //t->set_stylebox("hover","CheckButton", make_stylebox( button_hover_png,5,5,5,5,3,3,3,3) ); + t->set_stylebox("focus","CheckButton", focus ); + + t->set_icon("on","CheckButton", make_icon(toggle_on_png) ); + t->set_icon("off","CheckButton", make_icon(toggle_off_png)); + t->set_font("font","CheckButton", default_font ); + t->set_color("font_color","CheckButton", control_font_color ); t->set_color("font_color_pressed","CheckButton", control_font_color_pressed ); t->set_color("font_color_hover","CheckButton", control_font_color_hover ); t->set_color("font_color_disabled","CheckButton", control_font_color_disabled ); - t->set_icon("on","CheckButton", make_icon(toggle_on_png) ); - t->set_icon("off","CheckButton", make_icon(toggle_off_png)); -// t->set_stylebox("focus","CheckButton", focus ); - t->set_stylebox("focus","CheckButton", make_empty_stylebox(0,0,0,0) ); + t->set_constant("hseparation","CheckButton",4); t->set_constant("check_vadjust","CheckButton",0); + + + // Label t->set_font("font","Label", default_font ); + t->set_color("font_color","Label", Color(1,1,1) ); t->set_color("font_color_shadow","Label", Color(0,0,0,0) ); + t->set_constant("shadow_offset_x","Label", 1 ); t->set_constant("shadow_offset_y","Label", 1 ); t->set_constant("shadow_as_outline","Label", 0 ); - t->set_stylebox("normal","LineEdit", make_stylebox( line_edit_png,4,4,4,4,3,3,3,3) ); - t->set_stylebox("focus","LineEdit", focus ); - t->set_stylebox("read_only","LineEdit", make_stylebox( line_edit_disabled_png,6,6,6,6,4,4,4,4) ); - Image n(line_edit_png); - Image nf(line_edit_focus_png); + // LineEdit + + t->set_stylebox("normal","LineEdit", make_stylebox( line_edit_png,5,5,5,5) ); + t->set_stylebox("focus","LineEdit", focus ); + t->set_stylebox("read_only","LineEdit", make_stylebox( line_edit_disabled_png,6,6,6,6) ); t->set_font("font","LineEdit", default_font ); + t->set_color("font_color","LineEdit", control_font_color ); t->set_color("font_color_selected","LineEdit", Color(0,0,0) ); t->set_color("cursor_color","LineEdit", control_font_color_hover ); t->set_color("selection_color","LineEdit", font_color_selection ); + t->set_constant("minimum_spaces","LineEdit", 8 ); - t->set_stylebox("bg","ProgressBar", make_stylebox( progress_bar_png,4,4,4,4,0,0,0,0) ); - t->set_stylebox("fg","ProgressBar", make_stylebox( progress_fill_png,5,5,5,5,3,3,3,3) ); + + + // ProgressBar + + t->set_stylebox("bg","ProgressBar", make_stylebox( progress_bar_png,5,5,5,5) ); + t->set_stylebox("fg","ProgressBar", make_stylebox( progress_fill_png,6,6,6,6) ); + t->set_font("font","ProgressBar", default_font ); + t->set_color("font_color","ProgressBar", control_font_color_hover ); t->set_color("font_color_shadow","ProgressBar", Color(0,0,0) ); - t->set_icon("tab","TextEdit", make_icon( tab_png) ); - t->set_stylebox("normal","TextEdit", make_stylebox( tree_bg_png,2,2,2,2,3,3,3,3) ); - t->set_stylebox("focus","TextEdit", focus ); - t->set_stylebox("completion","TextEdit", make_stylebox( tree_bg_png,2,2,2,2,3,3,3,3) ); - t->set_constant("completion_lines","TextEdit", 7 ); - t->set_constant("completion_max_width","TextEdit", 50 ); - t->set_constant("completion_scroll_width","TextEdit", 3 ); - t->set_color("completion_scroll_color","TextEdit", control_font_color_pressed ); - t->set_color("completion_existing","TextEdit", control_font_color ); + // TextEdit + + t->set_stylebox("normal","TextEdit", make_stylebox( tree_bg_png,3,3,3,3) ); + t->set_stylebox("focus","TextEdit", focus ); + t->set_stylebox("completion","TextEdit", make_stylebox( tree_bg_png,3,3,3,3) ); - //t->set_font("font","TextEdit", mono_font ); + t->set_icon("tab","TextEdit", make_icon( tab_png) ); t->set_font("font","TextEdit", default_font ); + + t->set_color("completion_scroll_color","TextEdit", control_font_color_pressed ); + t->set_color("completion_existing","TextEdit", control_font_color ); t->set_color("font_color","TextEdit", control_font_color ); t->set_color("font_color_selected","TextEdit", Color(0,0,0) ); t->set_color("selection_color","TextEdit", font_color_selection ); @@ -333,12 +398,21 @@ void make_default_theme() { t->set_color("cursor_color","TextEdit", control_font_color ); t->set_color("symbol_color","TextEdit", control_font_color_hover ); t->set_color("brace_mismatch_color","TextEdit", Color(1,0.2,0.2) ); + + t->set_constant("completion_lines","TextEdit", 7 ); + t->set_constant("completion_max_width","TextEdit", 50 ); + t->set_constant("completion_scroll_width","TextEdit", 3 ); t->set_constant("line_spacing","TextEdit",4 ); - t->set_stylebox("scroll","HScrollBar", make_stylebox( hscroll_bg_png,3,3,3,3) ); - t->set_stylebox("scroll_focus","HScrollBar", make_stylebox( hscroll_bg_png,3,3,3,3) ); - t->set_stylebox("grabber","HScrollBar", make_stylebox( hscroll_grabber_png,3,3,3,3) ); - t->set_stylebox("grabber_hilite","HScrollBar", make_stylebox( hscroll_grabber_hl_png,3,3,3,3) ); + + Ref empty_icon = memnew( ImageTexture ); + + // HScrollBar + + t->set_stylebox("scroll","HScrollBar", make_stylebox( scroll_bg_png,3,3,3,3,0,0,0,0) ); + t->set_stylebox("scroll_focus","HScrollBar", make_stylebox( scroll_bg_png,3,3,3,3,0,0,0,0) ); + t->set_stylebox("grabber","HScrollBar", make_stylebox( scroll_grabber_png,3,3,3,3,2,2,2,2) ); + t->set_stylebox("grabber_hilite","HScrollBar", make_stylebox( scroll_grabber_hl_png,3,3,3,3,2,2,2,2) ); t->set_icon("increment","HScrollBar",empty_icon); t->set_icon("increment_hilite","HScrollBar",empty_icon); @@ -346,77 +420,109 @@ void make_default_theme() { t->set_icon("decrement_hilite","HScrollBar",empty_icon); - t->set_stylebox("scroll","VScrollBar", make_stylebox( vscroll_bg_png,3,3,3,3) ); - t->set_stylebox("scroll_focus","VScrollBar", make_stylebox( vscroll_bg_png,3,3,3,3) ); - t->set_stylebox("grabber","VScrollBar", make_stylebox( vscroll_grabber_png,3,3,3,3) ); - t->set_stylebox("grabber_hilite","VScrollBar", make_stylebox( vscroll_grabber_hl_png,3,3,3,3) ); + + // VScrollBar + + t->set_stylebox("scroll","VScrollBar", make_stylebox( scroll_bg_png,3,3,3,3,0,0,0,0) ); + t->set_stylebox("scroll_focus","VScrollBar", make_stylebox( scroll_bg_png,3,3,3,3,0,0,0,0) ); + t->set_stylebox("grabber","VScrollBar", make_stylebox( scroll_grabber_png,3,3,3,3,2,2,2,2) ); + t->set_stylebox("grabber_hilite","VScrollBar", make_stylebox( scroll_grabber_hl_png,3,3,3,3,2,2,2,2) ); + t->set_icon("increment","VScrollBar",empty_icon); t->set_icon("increment_hilite","VScrollBar",empty_icon); t->set_icon("decrement","VScrollBar",empty_icon); t->set_icon("decrement_hilite","VScrollBar",empty_icon); - t->set_stylebox("slider","HSlider", make_stylebox( hslider_bg_png,5,5,5,5,1,1,1,1) ); - t->set_stylebox("focus","HSlider", make_stylebox( focus_png,3,3,3,3,1,1,1,1) ); - //t->set_stylebox("slider_focus","HSlider", make_stylebox( hslider_bg_focus_png,6,6,6,6,2,2,2,2) ); + + + // HSlider + + t->set_stylebox("slider","HSlider", make_stylebox( hslider_bg_png,4,4,4,4) ); + t->set_stylebox("grabber_hilite","HSlider", make_stylebox( hslider_grabber_hl_png,6,6,6,6) ); + t->set_stylebox("focus","HSlider", focus ); + t->set_icon("grabber","HSlider", make_icon( hslider_grabber_png ) ); t->set_icon("grabber_hilite","HSlider", make_icon( hslider_grabber_hl_png ) ); t->set_icon("tick","HSlider", make_icon( hslider_tick_png ) ); - t->set_stylebox("grabber_hilite","HSlider", make_stylebox( hslider_grabber_hl_png,6,6,6,6,2,2,2,2) ); - t->set_stylebox("slider","VSlider", make_stylebox( vslider_bg_png,5,5,5,5,1,1,1,1) ); - t->set_stylebox("focus","HSlider", make_stylebox( focus_png,3,3,3,3,1,1,1,1) ); - //t->set_stylebox("slider_focus","VSlider", make_stylebox( vslider_bg_focus_png,6,6,6,6,2,2,2,2) ); + + + + // VSlider + + t->set_stylebox("slider","VSlider", make_stylebox( vslider_bg_png,4,4,4,4) ); + t->set_stylebox("grabber_hilite","VSlider", make_stylebox( vslider_grabber_hl_png,6,6,6,6) ); + t->set_stylebox("focus","HSlider", focus ); + t->set_icon("grabber","VSlider", make_icon( vslider_grabber_png) ); t->set_icon("grabber_hilite","VSlider", make_icon( vslider_grabber_hl_png ) ); t->set_icon("tick","VSlider", make_icon( vslider_tick_png ) ); - t->set_stylebox("grabber_hilite","VSlider", make_stylebox( vslider_grabber_hl_png,6,6,6,6,2,2,2,2) ); + + + + // SpinBox t->set_icon("updown","SpinBox",make_icon(spinbox_updown_png)); - Ref style_pp_win = make_stylebox( popup_window_png,6,28,6,7,8,8,8,8); + + // WindowDialog + + Ref style_pp_win = make_stylebox( popup_window_png,6,28,6,7); for(int i=0;i<4;i++) style_pp_win->set_expand_margin_size((Margin)i,3); style_pp_win->set_expand_margin_size(MARGIN_TOP,26); + t->set_stylebox("panel","WindowDialog", style_pp_win ); - t->set_constant("titlebar_height","WindowDialog", 18 ); - t->set_constant("title_height","WindowDialog", 20 ); - t->set_font("title_font","WindowDialog", large_font ); - t->set_color("title_color","WindowDialog", Color(0,0,0) ); + t->set_icon("close","WindowDialog", make_icon( close_png ) ); t->set_icon("close_hilite","WindowDialog", make_icon( close_hl_png ) ); + + t->set_font("title_font","WindowDialog", large_font ); + + t->set_color("title_color","WindowDialog", Color(0,0,0) ); + t->set_constant("close_h_ofs","WindowDialog", 22 ); t->set_constant("close_v_ofs","WindowDialog", 20 ); + t->set_constant("titlebar_height","WindowDialog", 18 ); + t->set_constant("title_height","WindowDialog", 20 ); - Ref style_pp = make_stylebox( popup_bg_png,4,4,4,4,8,8,8,8); - style_pp->set_expand_margin_size(MARGIN_LEFT,2); - style_pp->set_expand_margin_size(MARGIN_TOP,3); - style_pp->set_expand_margin_size(MARGIN_RIGHT,2); - style_pp->set_expand_margin_size(MARGIN_BOTTOM,3); + // Popup - t->set_stylebox("panel","PopupMenu", style_pp ); - t->set_stylebox("panel","PopupPanel", style_pp ); + Ref style_pp = make_stylebox( popup_bg_png,4,4,4,4,8,8,8,8); Ref selected = make_stylebox( selection_png,6,6,6,6); for(int i=0;i<4;i++) { selected->set_expand_margin_size(Margin(i),2); } - t->set_stylebox("panel_disabled","PopupMenu", make_stylebox( popup_bg_disabled_png,5,5,5,5) ); + t->set_stylebox("panel","PopupPanel", style_pp ); + + + + + // PopupMenu + + t->set_stylebox("panel","PopupMenu", make_stylebox( popup_bg_png,4,4,4,4,10,10,10,10) ); + t->set_stylebox("panel_disabled","PopupMenu", make_stylebox( popup_bg_disabled_png,4,4,4,4) ); t->set_stylebox("hover","PopupMenu", selected ); t->set_stylebox("separator","PopupMenu", make_stylebox( vseparator_png,3,3,3,3) ); - t->set_icon("checked","PopupMenu", make_icon(popup_checked_png) ); - t->set_icon("unchecked","PopupMenu", make_icon(popup_unchecked_png) ); + + t->set_icon("checked","PopupMenu", make_icon(checked_png) ); + t->set_icon("unchecked","PopupMenu", make_icon(unchecked_png) ); t->set_icon("submenu","PopupMenu", make_icon(submenu_png) ); + t->set_font("font","PopupMenu", default_font ); + t->set_color("font_color","PopupMenu", control_font_color ); t->set_color("font_color_accel","PopupMenu", Color(0.7,0.7,0.7,0.8) ); t->set_color("font_color_disabled","PopupMenu", Color(0.4,0.4,0.4,0.8) ); t->set_color("font_color_hover","PopupMenu", control_font_color ); - t->set_constant("hseparation","PopupMenu",2); - t->set_constant("vseparation","PopupMenu",1); + + t->set_constant("hseparation","PopupMenu",4); + t->set_constant("vseparation","PopupMenu",4); Ref graphsb = make_stylebox(graph_node_png,6,24,6,5,16,24,16,5); //graphsb->set_expand_margin_size(MARGIN_LEFT,10); @@ -432,57 +538,65 @@ void make_default_theme() { t->set_constant("port_offset","GraphNode", 3); - t->set_stylebox("bg","Tree", make_stylebox( tree_bg_png,4,4,4,5,3,3,3,3) ); + // Tree + + Ref tree_selected = make_stylebox( selection_png,4,4,4,4,8,0,8,0); + Ref tree_selected_oof = make_stylebox( selection_oof_png,4,4,4,4,8,0,8,0); + + t->set_stylebox("bg","Tree", make_stylebox( tree_bg_png,4,4,4,5) ); t->set_stylebox("bg_focus","Tree", focus ); - Ref tree_selected = make_stylebox( selection_png,4,4,4,4); - Ref tree_selected_oof = make_stylebox( selection_oof_png,4,4,4,4); - for(int i=0;i<4;i++) { - tree_selected->set_expand_margin_size(Margin(i),2); - tree_selected_oof->set_expand_margin_size(Margin(i),2); - } t->set_stylebox("selected","Tree", tree_selected_oof ); t->set_stylebox("selected_focus","Tree", tree_selected ); - t->set_stylebox("completion_selected","TextEdit", tree_selected ); - - t->set_stylebox("cursor","Tree", focus ); t->set_stylebox("cursor_unfocused","Tree", focus ); - t->set_stylebox("button_pressed","Tree",make_stylebox( button_pressed_png,4,4,4,4,3,3,3,3)); + t->set_stylebox("button_pressed","Tree",make_stylebox( button_pressed_png,4,4,4,4)); + t->set_stylebox("title_button_normal","Tree", make_stylebox( tree_title_png,4,4,4,4) ); + t->set_stylebox("title_button_pressed","Tree", make_stylebox( tree_title_pressed_png,4,4,4,4) ); + t->set_stylebox("title_button_hover","Tree", make_stylebox( tree_title_png,4,4,4,4) ); + + t->set_icon("checked","Tree",make_icon(checked_png)); + t->set_icon("unchecked","Tree",make_icon(unchecked_png)); + t->set_icon("updown","Tree",make_icon(updown_png)); + t->set_icon("select_arrow","Tree",make_icon(dropdown_png)); + t->set_icon("arrow","Tree",make_icon(arrow_down_png)); + t->set_icon("arrow_collapsed","Tree",make_icon(arrow_right_png)); + + t->set_font("title_button_font","Tree", default_font ); t->set_font("font","Tree", default_font ); + + t->set_color("title_button_color","Tree", control_font_color ); t->set_color("font_color","Tree", control_font_color_low ); t->set_color("font_color_selected","Tree", control_font_color_pressed ); t->set_color("selection_color","Tree", Color(0.1,0.1,1,0.8) ); t->set_color("cursor_color","Tree", Color(0,0,0) ); t->set_color("guide_color","Tree", Color(0,0,0,0.1) ); - t->set_constant("hseparation","Tree",2); - t->set_constant("vseparation","Tree",1); - t->set_constant("guide_width","Tree",1); + + t->set_constant("hseparation","Tree",4); + t->set_constant("vseparation","Tree",2); + t->set_constant("guide_width","Tree",2); t->set_constant("item_margin","Tree",12); - t->set_constant("button_margin","Tree",2); + t->set_constant("button_margin","Tree",4); - t->set_stylebox("title_button_normal","Tree", make_stylebox( tree_title_png,4,4,4,4,3,3,3,3) ); - t->set_stylebox("title_button_pressed","Tree", make_stylebox( tree_title_pressed_png,4,4,4,4,3,3,3,3) ); - t->set_stylebox("title_button_hover","Tree", make_stylebox( tree_title_png,4,4,4,4,3,3,3,3) ); - t->set_color("title_button_color","Tree", control_font_color ); - t->set_font("title_button_font","Tree", default_font ); - t->set_icon("checked","Tree",make_icon(checked_png)); - t->set_icon("unchecked","Tree",make_icon(unchecked_png)); - t->set_icon("updown","Tree",make_icon(updown_png)); - t->set_icon("select_arrow","Tree",make_icon(dropdown_png)); - t->set_icon("arrow","Tree",make_icon(arrow_down_png)); - t->set_icon("arrow_collapsed","Tree",make_icon(arrow_right_png)); + // TextEdit + + t->set_stylebox("completion_selected","TextEdit", tree_selected ); + + + + // TabContainer - t->set_stylebox("tab_fg","TabContainer", make_stylebox( tab_current_png,5,5,5,5,8,3,8,3) ); - t->set_stylebox("tab_bg","TabContainer", make_stylebox( tab_behind_png,5,5,5,5,8,4,8,3) ); Ref tc_sb = make_stylebox( tab_container_bg_png,4,4,4,4); for(int i=0;i<4;i++) { - tc_sb->set_default_margin(Margin(i),7); + tc_sb->set_default_margin(Margin(i),4); tc_sb->set_expand_margin_size(Margin(i),2); } - //tc_sb->set_expand_margin_size(MARGIN_TOP,2); - //tc_sb->set_default_margin(MARGIN_TOP,6); + tc_sb->set_expand_margin_size(MARGIN_TOP,2); + tc_sb->set_default_margin(MARGIN_TOP,8); + + t->set_stylebox("tab_fg","TabContainer", make_stylebox( tab_current_png,4,4,4,4,8,4,8,4) ); + t->set_stylebox("tab_bg","TabContainer", make_stylebox( tab_behind_png,4,4,4,4,8,6,8,4) ); t->set_stylebox("panel","TabContainer", tc_sb ); t->set_icon("increment","TabContainer",make_icon( scroll_button_right_png)); @@ -491,116 +605,178 @@ void make_default_theme() { t->set_icon("decrement_hilite","TabContainer",make_icon( scroll_button_left_hl_png)); t->set_font("font","TabContainer", default_font ); + t->set_color("font_color_fg","TabContainer", control_font_color_hover ); t->set_color("font_color_bg","TabContainer", control_font_color_low ); - t->set_constant("side_margin","TabContainer", 5 ); + + t->set_constant("side_margin","TabContainer", 8 ); t->set_constant("top_margin","TabContainer", 24); - t->set_constant("label_valign_fg","TabContainer", 4); - t->set_constant("label_valign_bg","TabContainer", 5); - t->set_constant("hseparation","TabContainer", 2); + t->set_constant("label_valign_fg","TabContainer", 0); + t->set_constant("label_valign_bg","TabContainer", 2); + t->set_constant("hseparation","TabContainer", 4); + + + + // Tabs + + t->set_stylebox("tab_fg","Tabs", make_stylebox( tab_current_png,4,4,4,4) ); + t->set_stylebox("tab_bg","Tabs", make_stylebox( tab_behind_png,4,4,4,4) ); + t->set_stylebox("panel","Tabs", make_stylebox( tab_container_bg_png,4,4,4,4) ); - t->set_stylebox("tab_fg","Tabs", make_stylebox( tab_current_png,5,5,5,5,16,3,16,3) ); - t->set_stylebox("tab_bg","Tabs", make_stylebox( tab_behind_png,5,5,5,5,16,4,16,3) ); - t->set_stylebox("panel","Tabs", make_stylebox( tab_container_bg_png,4,4,4,4,6,6,6,6) ); t->set_font("font","Tabs", default_font ); + t->set_color("font_color_fg","Tabs", control_font_color_hover ); t->set_color("font_color_bg","Tabs", control_font_color_low ); + t->set_constant("top_margin","Tabs", 24); - t->set_constant("label_valign_fg","Tabs", 4); - t->set_constant("label_valign_bg","Tabs", 5); - t->set_constant("hseparation","Tabs", 0); + t->set_constant("label_valign_fg","Tabs", 0); + t->set_constant("label_valign_bg","Tabs", 2); + t->set_constant("hseparation","Tabs", 4); + + + + // Separators t->set_stylebox("separator","HSeparator", make_stylebox( vseparator_png,3,3,3,3) ); - t->set_constant("separation","HSeparator", 7); t->set_stylebox("separator","VSeparator", make_stylebox( hseparator_png,3,3,3,3) ); - t->set_constant("separation","VSeparator", 7); t->set_icon("close","Icons", make_icon(icon_close_png)); t->set_font("source","Fonts", source_font); t->set_font("normal","Fonts", default_font ); t->set_font("large","Fonts", large_font ); + t->set_constant("separation","HSeparator", 4); + t->set_constant("separation","VSeparator", 4); - t->set_constant("margin","Dialogs",10); + // Dialogs + + t->set_constant("margin","Dialogs",8); t->set_constant("button_margin","Dialogs",32); + + + + // FileDialog t->set_icon("folder","FileDialog",make_icon(icon_folder_png)); + t->set_color("files_disabled","FileDialog",Color(0,0,0,0.7)); + + + // colorPicker + t->set_constant("value_height","ColorPicker", 23 ); t->set_constant("value_width","ColorPicker", 50); t->set_constant("color_width","ColorPicker", 100); - t->set_constant("label_width","ColorPicker", 15); + t->set_constant("label_width","ColorPicker", 20); t->set_constant("hseparator","ColorPicker", 4); - Ref style_tt = make_stylebox( tooltip_bg_png,9,9,9,9,8,8,8,8); + + + // TooltipPanel + + Ref style_tt = make_stylebox( tooltip_bg_png,4,4,4,4); for(int i=0;i<4;i++) style_tt->set_expand_margin_size((Margin)i,4); + t->set_stylebox("panel","TooltipPanel", style_tt ); + t->set_font("font","TooltipLabel", default_font ); + t->set_color("font_color","TooltipLabel", Color(0,0,0) ); t->set_color("font_color_shadow","TooltipLabel", Color(0,0,0,0.1) ); + t->set_constant("shadow_offset_x","TooltipLabel", 1 ); t->set_constant("shadow_offset_y","TooltipLabel", 1 ); + + + // RichTextLabel + + t->set_stylebox("focus","RichTextLabel", focus ); + t->set_font("default_font","RichTextLabel", default_font ); + t->set_color("default_color","RichTextLabel", control_font_color ); t->set_color("font_color_selected","RichTextLabel", font_color_selection ); t->set_color("selection_color","RichTextLabel", Color(0.1,0.1,1,0.8) ); + t->set_constant("line_separation","RichTextLabel", 1 ); - t->set_stylebox("focus","RichTextLabel", focus ); + + // Containers + + t->set_stylebox("bg","VSplitContainer", make_stylebox( vsplit_bg_png,1,1,1,1) ); + t->set_stylebox("bg","HSplitContainer", make_stylebox( hsplit_bg_png,1,1,1,1) ); + + t->set_icon("grabber","VSplitContainer",make_icon(vsplitter_png)); + t->set_icon("grabber","HSplitContainer",make_icon(hsplitter_png)); + t->set_constant("separation","HBoxContainer",4); t->set_constant("separation","VBoxContainer",4); - t->set_constant("margin","MarginContainer",15); - + t->set_constant("margin","MarginContainer",8); t->set_constant("separation","GridContainer",4); - - t->set_constant("separation","HSplitContainer",8); - t->set_constant("separation","VSplitContainer",8); + t->set_constant("separation","HSplitContainer",12); + t->set_constant("separation","VSplitContainer",12); t->set_constant("autohide","HSplitContainer",1); t->set_constant("autohide","VSplitContainer",1); - t->set_icon("grabber","VSplitContainer",make_icon(vsplitter_png)); - t->set_icon("grabber","HSplitContainer",make_icon(hsplitter_png)); - t->set_stylebox("bg","VSplitContainer", make_stylebox( vsplit_bg_png,1,1,1,1,1,1,1,1) ); - t->set_stylebox("bg","HSplitContainer", make_stylebox( hsplit_bg_png,1,1,1,1,1,1,1,1) ); - t->set_stylebox("normal","HButtonArray", make_stylebox( button_normal_png,5,5,5,5,3,3,3,3) ); - t->set_stylebox("selected","HButtonArray", make_stylebox( button_pressed_png,5,5,5,5,3,3,3,3) ); - t->set_stylebox("hover","HButtonArray", make_stylebox( button_hover_png,5,5,5,5,3,3,3,3) ); - t->set_stylebox("focus","HButtonArray", make_stylebox( focus_png,5,5,5,5,3,3,3,3) ); + + // HButtonArray + + t->set_stylebox("normal","HButtonArray", make_stylebox( button_normal_png,4,4,4,4,0,4,22,4) ); + t->set_stylebox("selected","HButtonArray", make_stylebox( button_pressed_png,4,4,4,4,0,4,22,4) ); + t->set_stylebox("hover","HButtonArray", make_stylebox( button_hover_png,4,4,4,4) ); + t->set_font("font","HButtonArray", default_font); t->set_font("font_selected","HButtonArray", default_font); + t->set_color("font_color","HButtonArray", control_font_color_low ); t->set_color("font_color_selected","HButtonArray", control_font_color_hover ); - t->set_constant("icon_separator","HButtonArray", 2 ); - t->set_constant("button_separator","HButtonArray", 3 ); - t->set_stylebox("normal","VButtonArray", make_stylebox( button_normal_png,5,5,5,5,3,3,3,3) ); - t->set_stylebox("selected","VButtonArray", make_stylebox( button_pressed_png,5,5,5,5,3,3,3,3) ); - t->set_stylebox("hover","VButtonArray", make_stylebox( button_hover_png,5,5,5,5,3,3,3,3) ); - t->set_stylebox("focus","VButtonArray", make_stylebox( focus_png,5,5,5,5,3,3,3,3) ); + t->set_constant("icon_separator","HButtonArray", 4 ); + t->set_constant("button_separator","HButtonArray", 8 ); + + t->set_stylebox("focus","HButtonArray", focus ); + + + // VButtonArray + + t->set_stylebox("normal","VButtonArray", make_stylebox( button_normal_png,4,4,4,4,0,4,22,4) ); + t->set_stylebox("selected","VButtonArray", make_stylebox( button_pressed_png,4,4,4,4,0,4,22,4) ); + t->set_stylebox("hover","VButtonArray", make_stylebox( button_hover_png,4,4,4,4) ); + t->set_font("font","VButtonArray", default_font); t->set_font("font_selected","VButtonArray", default_font); + t->set_color("font_color","VButtonArray", control_font_color_low ); t->set_color("font_color_selected","VButtonArray", control_font_color_hover ); - t->set_constant("icon_separator","VButtonArray", 2 ); - t->set_constant("button_separator","VButtonArray", 3 ); - t->set_stylebox("border","ReferenceFrame", make_stylebox( reference_border_png,5,5,5,5,3,3,3,3) ); + t->set_constant("icon_separator","VButtonArray", 4); + t->set_constant("button_separator","VButtonArray", 8); + + t->set_stylebox("focus","VButtonArray", focus ); + + + // ReferenceFrame Ref ttnc = make_stylebox( full_panel_bg_png,8,8,8,8); ttnc->set_draw_center(false); + + t->set_stylebox("border","ReferenceFrame", make_stylebox( reference_border_png,4,4,4,4) ); t->set_stylebox("panelnc","Panel", ttnc ); t->set_stylebox("panelf","Panel", tc_sb ); - t->set_stylebox("panel","PanelContainer", tc_sb ); t->set_icon( "logo","Icons", make_icon(logo_png) ); + + + // Theme + Theme::set_default( t ); Theme::set_default_icon( make_icon(error_icon_png) ); Theme::set_default_style( make_stylebox( error_icon_png,2,2,2,2) ); @@ -627,8 +803,8 @@ void make_default_theme() { style->set_texture(texture); for(int i=0;i<4;i++) { - style->set_margin_size( Margin(),2); - style->set_default_margin( Margin(),2); + style->set_margin_size( Margin(),8); + style->set_default_margin( Margin(),8); } Ref f = make_default_font(); -- cgit v1.2.3 From d8f453cb39b06399282b0408e9bccd97e9340074 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ralf=20H=C3=B6lzemer?= Date: Sun, 21 Sep 2014 02:35:01 +0200 Subject: Missing files and Tab changes --- scene/resources/default_theme/default_theme.cpp | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'scene/resources/default_theme/default_theme.cpp') diff --git a/scene/resources/default_theme/default_theme.cpp b/scene/resources/default_theme/default_theme.cpp index 47b94e5d6a..efcd10eb03 100644 --- a/scene/resources/default_theme/default_theme.cpp +++ b/scene/resources/default_theme/default_theme.cpp @@ -250,7 +250,7 @@ void make_default_theme() { tb_empty->set_default_margin(MARGIN_BOTTOM,4); t->set_stylebox("normal","ToolButton", tb_empty); - t->set_stylebox("pressed","ToolButton", make_stylebox( button_pressed_png,4,4,4,4) ); + t->set_stylebox("pressed","ToolButton", make_stylebox( button_pressed_png,4,4,4,4,8) ); 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 ); @@ -361,7 +361,7 @@ void make_default_theme() { t->set_color("cursor_color","LineEdit", control_font_color_hover ); t->set_color("selection_color","LineEdit", font_color_selection ); - t->set_constant("minimum_spaces","LineEdit", 8 ); + t->set_constant("minimum_spaces","LineEdit", 12 ); @@ -595,8 +595,8 @@ void make_default_theme() { tc_sb->set_expand_margin_size(MARGIN_TOP,2); tc_sb->set_default_margin(MARGIN_TOP,8); - t->set_stylebox("tab_fg","TabContainer", make_stylebox( tab_current_png,4,4,4,4,8,4,8,4) ); - t->set_stylebox("tab_bg","TabContainer", make_stylebox( tab_behind_png,4,4,4,4,8,6,8,4) ); + t->set_stylebox("tab_fg","TabContainer", make_stylebox( tab_current_png,4,4,4,4,16,4,16,4) ); + t->set_stylebox("tab_bg","TabContainer", make_stylebox( tab_behind_png,4,4,4,4,16,6,16,4) ); t->set_stylebox("panel","TabContainer", tc_sb ); t->set_icon("increment","TabContainer",make_icon( scroll_button_right_png)); @@ -619,8 +619,8 @@ void make_default_theme() { // Tabs - t->set_stylebox("tab_fg","Tabs", make_stylebox( tab_current_png,4,4,4,4) ); - t->set_stylebox("tab_bg","Tabs", make_stylebox( tab_behind_png,4,4,4,4) ); + 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_font("font","Tabs", default_font ); -- cgit v1.2.3 From 5fc787abd8d373002439ca01b437fa8f46ab1e24 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ralf=20H=C3=B6lzemer?= Date: Thu, 25 Sep 2014 01:25:16 +0200 Subject: Fixed the progressbar to only require 16px in height --- scene/resources/default_theme/default_theme.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'scene/resources/default_theme/default_theme.cpp') diff --git a/scene/resources/default_theme/default_theme.cpp b/scene/resources/default_theme/default_theme.cpp index efcd10eb03..0dd915e741 100644 --- a/scene/resources/default_theme/default_theme.cpp +++ b/scene/resources/default_theme/default_theme.cpp @@ -367,8 +367,8 @@ void make_default_theme() { // ProgressBar - t->set_stylebox("bg","ProgressBar", make_stylebox( progress_bar_png,5,5,5,5) ); - t->set_stylebox("fg","ProgressBar", make_stylebox( progress_fill_png,6,6,6,6) ); + t->set_stylebox("bg","ProgressBar", make_stylebox( progress_bar_png,4,4,4,4,0,0,0,0) ); + t->set_stylebox("fg","ProgressBar", make_stylebox( progress_fill_png,6,6,6,6,2,1,2,1) ); t->set_font("font","ProgressBar", default_font ); -- cgit v1.2.3 From 7f20b864cd08280a38f99a0a968ed4832d32a026 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ralf=20H=C3=B6lzemer?= Date: Wed, 8 Oct 2014 00:45:39 +0200 Subject: Tweak Button margins & small fix for ToolButton --- scene/resources/default_theme/default_theme.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'scene/resources/default_theme/default_theme.cpp') diff --git a/scene/resources/default_theme/default_theme.cpp b/scene/resources/default_theme/default_theme.cpp index 0dd915e741..1f0b5f1545 100644 --- a/scene/resources/default_theme/default_theme.cpp +++ b/scene/resources/default_theme/default_theme.cpp @@ -206,7 +206,7 @@ void make_default_theme() { // Button - t->set_stylebox("normal","Button", make_stylebox( button_normal_png,4,4,4,4,16,4,16,4) ); + t->set_stylebox("normal","Button", make_stylebox( button_normal_png,4,4,4,4,8,4,8,4) ); t->set_stylebox("pressed","Button", make_stylebox( button_pressed_png,4,4,4,4) ); t->set_stylebox("hover","Button", make_stylebox( button_hover_png,4,4,4,4) ); t->set_stylebox("disabled","Button", make_stylebox( button_disabled_png,4,4,4,4) ); @@ -250,7 +250,7 @@ void make_default_theme() { tb_empty->set_default_margin(MARGIN_BOTTOM,4); t->set_stylebox("normal","ToolButton", tb_empty); - t->set_stylebox("pressed","ToolButton", make_stylebox( button_pressed_png,4,4,4,4,8) ); + t->set_stylebox("pressed","ToolButton", make_stylebox( button_pressed_png,4,4,4,4) ); 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 ); -- cgit v1.2.3 From 2ca8b2683ea7cf3c80024cab841ac9d28959632b Mon Sep 17 00:00:00 2001 From: marynate Date: Tue, 13 Jan 2015 17:30:44 +0800 Subject: Minor code formatting --- scene/resources/default_theme/default_theme.cpp | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) (limited to 'scene/resources/default_theme/default_theme.cpp') diff --git a/scene/resources/default_theme/default_theme.cpp b/scene/resources/default_theme/default_theme.cpp index 1f0b5f1545..8264601786 100644 --- a/scene/resources/default_theme/default_theme.cpp +++ b/scene/resources/default_theme/default_theme.cpp @@ -168,8 +168,6 @@ void make_default_theme() { tex_cache = memnew( TexCacheMap ); -// uint32_t last=OS::get_singleton()->get_ticks_msec(); - Ref t( memnew( Theme ) ); //Ref default_font = make_font(_bi_font_normal_height,_bi_font_normal_ascent,_bi_font_normal_valign,_bi_font_normal_charcount,_bi_font_normal_characters,make_icon(font_normal_png)); @@ -177,7 +175,6 @@ void make_default_theme() { Ref source_font=make_font2(_builtin_source_font_height,_builtin_source_font_ascent,_builtin_source_font_charcount,&_builtin_source_font_charrects[0][0],_builtin_source_font_kerning_pair_count,&_builtin_source_font_kerning_pairs[0][0],_builtin_source_font_img_width,_builtin_source_font_img_height,_builtin_source_font_img_data); Ref large_font=make_font2(_builtin_large_font_height,_builtin_large_font_ascent,_builtin_large_font_charcount,&_builtin_large_font_charrects[0][0],_builtin_large_font_kerning_pair_count,&_builtin_large_font_kerning_pairs[0][0],_builtin_large_font_img_width,_builtin_large_font_img_height,_builtin_large_font_img_data); - // Font Colors Color control_font_color = Color::html("e0e0e0"); @@ -188,7 +185,6 @@ void make_default_theme() { Color font_color_selection = Color::html("7d7d7d"); - // Panel t->set_stylebox("panel","Panel", make_stylebox( panel_bg_png,0,0,0,0) ); @@ -524,6 +520,9 @@ void make_default_theme() { t->set_constant("hseparation","PopupMenu",4); t->set_constant("vseparation","PopupMenu",4); + + // GraphNode + Ref graphsb = make_stylebox(graph_node_png,6,24,6,5,16,24,16,5); //graphsb->set_expand_margin_size(MARGIN_LEFT,10); //graphsb->set_expand_margin_size(MARGIN_RIGHT,10); @@ -539,7 +538,7 @@ void make_default_theme() { // Tree - + Ref tree_selected = make_stylebox( selection_png,4,4,4,4,8,0,8,0); Ref tree_selected_oof = make_stylebox( selection_oof_png,4,4,4,4,8,0,8,0); @@ -739,7 +738,7 @@ void make_default_theme() { t->set_constant("icon_separator","HButtonArray", 4 ); t->set_constant("button_separator","HButtonArray", 8 ); - + t->set_stylebox("focus","HButtonArray", focus ); -- cgit v1.2.3 From 7c430d52e986d8ef00afbb16852e6647f0df3cc7 Mon Sep 17 00:00:00 2001 From: marynate Date: Thu, 15 Jan 2015 13:28:55 +0800 Subject: Restore checkbutton margin to origin value, fixed issue in code search dialog --- scene/resources/default_theme/default_theme.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'scene/resources/default_theme/default_theme.cpp') diff --git a/scene/resources/default_theme/default_theme.cpp b/scene/resources/default_theme/default_theme.cpp index 8264601786..4d1e9896db 100644 --- a/scene/resources/default_theme/default_theme.cpp +++ b/scene/resources/default_theme/default_theme.cpp @@ -307,8 +307,8 @@ void make_default_theme() { Ref cb_empty = memnew( StyleBoxEmpty ); cb_empty->set_default_margin(MARGIN_LEFT,6); cb_empty->set_default_margin(MARGIN_RIGHT,70); - cb_empty->set_default_margin(MARGIN_TOP,6); - cb_empty->set_default_margin(MARGIN_BOTTOM,6); + cb_empty->set_default_margin(MARGIN_TOP,4); + cb_empty->set_default_margin(MARGIN_BOTTOM,4); t->set_stylebox("normal","CheckButton", cb_empty ); t->set_stylebox("pressed","CheckButton", cb_empty ); -- cgit v1.2.3