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: [PATCH] More Theme fixes - some color tweaks - many margin fixes - overall nicer look Conflicts: scene/resources/default_theme/default_theme.cpp --- scene/resources/default_theme/arrow_down.png | Bin 264 -> 239 bytes scene/resources/default_theme/arrow_right.png | Bin 279 -> 238 bytes .../resources/default_theme/button_normal.png | Bin 333 -> 333 bytes scene/resources/default_theme/close_hl.png | Bin 562 -> 412 bytes .../resources/default_theme/default_theme.cpp | 508 ++++++++++++------ scene/resources/default_theme/dropdown.png | Bin 254 -> 254 bytes .../resources/default_theme/full_panel_bg.png | Bin 366 -> 366 bytes scene/resources/default_theme/hscroll_bg.png | Bin 229 -> 0 bytes .../default_theme/hscroll_bg_focus.png | Bin 229 -> 0 bytes .../default_theme/hscroll_grabber.png | Bin 240 -> 0 bytes .../default_theme/hscroll_grabber_hl.png | Bin 203 -> 0 bytes scene/resources/default_theme/hslider_bg.png | Bin 229 -> 229 bytes scene/resources/default_theme/hsplit_bg.png | Bin 252 -> 173 bytes .../resources/default_theme/option_arrow.png | Bin 249 -> 249 bytes scene/resources/default_theme/popup_bg.png | Bin 301 -> 308 bytes .../resources/default_theme/progress_fill.png | Bin 283 -> 282 bytes scene/resources/default_theme/submenu.png | Bin 186 -> 173 bytes scene/resources/default_theme/theme_data.h | 87 ++- scene/resources/default_theme/toggle_off.png | Bin 735 -> 733 bytes scene/resources/default_theme/toggle_on.png | Bin 833 -> 831 bytes scene/resources/default_theme/tooltip_bg.png | Bin 1114 -> 325 bytes scene/resources/default_theme/vscroll_bg.png | Bin 218 -> 0 bytes .../default_theme/vscroll_bg_focus.png | Bin 218 -> 0 bytes .../default_theme/vscroll_grabber.png | Bin 261 -> 0 bytes .../default_theme/vscroll_grabber_hl.png | Bin 260 -> 0 bytes scene/resources/default_theme/vslider_bg.png | Bin 230 -> 229 bytes scene/resources/default_theme/vsplit_bg.png | Bin 252 -> 173 bytes 27 files changed, 373 insertions(+), 222 deletions(-) delete mode 100644 scene/resources/default_theme/hscroll_bg.png delete mode 100644 scene/resources/default_theme/hscroll_bg_focus.png delete mode 100644 scene/resources/default_theme/hscroll_grabber.png delete mode 100644 scene/resources/default_theme/hscroll_grabber_hl.png delete mode 100644 scene/resources/default_theme/vscroll_bg.png delete mode 100644 scene/resources/default_theme/vscroll_bg_focus.png delete mode 100644 scene/resources/default_theme/vscroll_grabber.png delete mode 100644 scene/resources/default_theme/vscroll_grabber_hl.png diff --git a/scene/resources/default_theme/arrow_down.png b/scene/resources/default_theme/arrow_down.png index 0519700216dd96099ff833967953e0b3ad1c288a..9537b21ab36559e4c88a16f0c37d3f71d8f414db 100644 GIT binary patch delta 205 zcmeBRde1mPt6q&kjX^Dv|6U0L0|RG)M`SSr1Gg{;GcwGYBf-GHz+U3%>&kwQQ$$#s zYoA{YNT|ls#W6%<;?j$!xta|G+#arRI`khb+Tmp$804wF(4MEo zxVUY?94C&fqII+Wxn~IQuR7V<@$>j2%d@RR_^9cWmU#`@fClM?`14jP+ZB<@Ia7(fq}u()z4*} HQ$iB}qLNS5 delta 230 zcmaFQ*ugYGtNuU3e}?}H_AZ~yz`(#+;1OBOz`!jG!i)^F=14FwFtC?+`ns~;C4GZp?z|@`C9~d6(W@m zomAexp|$YARJ|RyXFhrGp40B%k$DVf-Z0(S_aWT#yOJ(UfjsX7%1TOFh4M$f>m|xylcVv-s@fSl$7EemPYkz8 z-Zk^&OrL)%gS>tjaDC|H*Yfq{Xuz$3Dlfq`2Xgc%uT&5>YWU|=ut^mS#w$H^~Z z$+9@~`E>>ch9#aZjv*Qodnf7g9dZzGlecGLF?VQY<(;X)MlTHaU>zdP&#cdy~>nfwpA_1aB~> zKfhz6J!!pP7{d(4%VALwnrc4+)eju>Dr;9$vTxYB(*_2+vi2JRbKQVXI)W y_FVp|H*Yfq{Xuz$3Dlfq`2Xgc%uT&5>YWU|=ut^mS#w$0@?6 NZXTEGuQoCI696th5f}gf delta 59 zcmX@hbe3s?mZ1-W7lU7iX4W1AJS*F*vK5BCe#>nzc`erW23UD48!6*r?JPK0mRwDp6d z&V<%aj8isk3iC4aGBdN%R9(79C4Z;bvsW)=!pgI%tUmv#|Nr0E_`J`x9JA7-SlNw% zx;5#ZZx$C^mwm1t^)_K?-1_BD>U0+J^H+3N@J^m_)HLq)k}WM-VjEibGVr&YPm-5z zT=`FxVS2?e1v5kWeX=+AvOK$fNoe1Pmf$mqBF2gaEi$JqxED@h*z;H}e1;qI-W>;} z`WBh*|90Ov>`-vbQ~#0##pYS_+t#|@G7k)64z@VHwmxp5wD1jHr@pHnWR!1k`c$iV zHJiw7v|jT-NfKYVk#j%&k%D zOJnWDoMKcwKQS|0HhCMk{(7}LN2Qadtf%IF29HlnCS8l9yB5t6aMGId`S|IlpJuOG z_1$Xjxzk^(Vk6hqhuuptsuVr`@%vndI`%mNpElgg*=NYJ_}%Y)2|b!~KHuJa^UbFF z@9ljre-UPgG+|;43pjPGTD4_`ng6X_>vpeuy)U8Xs#y0?ldeTmQzP4#W!g;$s=HU8xBXGS-i>Xw zSKgN0|FtiE=K1H-7hila^Lgca-P2Y^Jdg8s#=Oflo6YYi;8X6s$E@kG1+QX@*3vyv zeC_FlGV|LLE9@kA&K)w?vuMhzIiIcTcb{TDUg#&8oXcSIScGAY;k9*PtCutIaoyRi nw&?BL&vsXImOt2kC_lb>nT`F*$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); - 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) ); + + // 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_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) ); + + + // 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,4,4,4,4) ); - Image n(line_edit_png); - Image nf(line_edit_focus_png); - - + 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) ); + + + // 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_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_font("font","TextEdit", default_font ); - 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 ); - - //t->set_font("font","TextEdit", mono_font ); - - t->set_font("font","TextEdit", default_font ); 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 ); + + // Popup + 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); - - - t->set_stylebox("panel","PopupMenu", style_pp ); - t->set_stylebox("panel","PopupPanel", style_pp ); 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,40 +538,21 @@ 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_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_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("item_margin","Tree",12); - t->set_constant("button_margin","Tree",2); - - 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_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)); @@ -474,15 +561,42 @@ void make_default_theme() { t->set_icon("arrow","Tree",make_icon(arrow_down_png)); t->set_icon("arrow_collapsed","Tree",make_icon(arrow_right_png)); - 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) ); + 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",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",4); + + + + // TextEdit + + t->set_stylebox("completion_selected","TextEdit", tree_selected ); + + + + // TabContainer + 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("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,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_constant("side_margin","TabContainer", 8 ); + t->set_constant("top_margin","TabContainer", 24); + 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_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 ); - t->set_constant("separation","HBoxContainer",4); - t->set_constant("separation","VBoxContainer",4); - t->set_constant("margin","MarginContainer",15); - t->set_constant("separation","GridContainer",4); + // 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_constant("separation","HSplitContainer",8); - t->set_constant("separation","VSplitContainer",8); - 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_constant("separation","HBoxContainer",4); + t->set_constant("separation","VBoxContainer",4); + t->set_constant("margin","MarginContainer",8); + t->set_constant("separation","GridContainer",4); + t->set_constant("separation","HSplitContainer",12); + t->set_constant("separation","VSplitContainer",12); + t->set_constant("autohide","HSplitContainer",1); + t->set_constant("autohide","VSplitContainer",1); + + + + // 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_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", 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(); diff --git a/scene/resources/default_theme/dropdown.png b/scene/resources/default_theme/dropdown.png index 24dd172067f79887e0af90616ee5eaf9436a1b90..72fc5d73a3b059b934fd63810477a9a7dcc2fd59 100644 GIT binary patch delta 18 Zcmeyz_>XZyFoy`QjC7D=(UOVLivc|`26_Mh delta 18 Zcmeyz_>XZyFbBVgxoHl^spN^#ivd3u2B`o5 diff --git a/scene/resources/default_theme/full_panel_bg.png b/scene/resources/default_theme/full_panel_bg.png index 516a8b4a499268f29bd204bc8f5b27dc5faf8b9b..771e50e2af740e10eefdab2846b9e9f6948c928b 100644 GIT binary patch delta 19 acmaFI^p0slFoy`Aj2cIN!<&uK!i)ey3I;O( delta 19 acmaFI^p0slFoysmqgh^;&cBV(!i)ez90pbZ diff --git a/scene/resources/default_theme/hscroll_bg.png b/scene/resources/default_theme/hscroll_bg.png deleted file mode 100644 index 515879a652664cf134c42cfc140c8e751dabc8af..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 229 zcmeAS@N?(olHy`uVBq!ia0y~yVBi2@4mJh`h9ms@x)~T4*pj^6T^J5A9AY?=m4Bv? zfq{Xuz$3Dlfq`2Xgc%uT&5>YWU|=ut^mS#w$0@|1$$wmO#RCQg2FViFh!W@g+}zZ> z5(ej@)Wnk16ovB4k_-iRPv3y>Mm}){1_obG7sn8ZsmW6&Oqg-(z<~)T8)SXbr%age zYWU|=ut^mS#w$0@|1$r5n7FoS`CL9)a(qQp5rH#aq} zgu%HeHL)Z$MWH;iBtya7(>EZzkx!g~fx*|)#W6%;YVwo`6J{JcaA3m823eoYWU|=ut^mS#w$0@|XWb~3zas~qfgJg+oM2T~LZfYWU|=ut^mS#w$0@|Xq~FC}>d3&rAX(xXQR1ARo12`qhq~IB?*= zffi>Wy<;t|OsoQH8w9&$l$n`VDR0zN%3);?oy&4**RsNE3=9kmp00i_>zopr088~Y AiU0rr diff --git a/scene/resources/default_theme/hslider_bg.png b/scene/resources/default_theme/hslider_bg.png index 1320001d8a3f55cd7d53b3af9618d09ca92eccca..963e4c8456abf71b9af87dd6ab4548f26d03944d 100644 GIT binary patch delta 106 zcmaFL_>^&imf>B7y9{@~igL_lU|`@Z@Q5sCVBi)8VMc~ob0ioT7}!fZeO=k_af#r76$D=f!_J@2G^&imf=i>nG7@IT*4X|7#KJUJR*x37`TN&n2}-D90>*n2KEw9Usv{foPy%U z+77SRe4H5V&H3j~lgrD0KR(({Tra9v|L4cN7Y<9VJPK@JVc@1B0il KpUXO@geCwXxFxm# diff --git a/scene/resources/default_theme/hsplit_bg.png b/scene/resources/default_theme/hsplit_bg.png index eda9b6616c5666da1786487fec96d1d252b9b2f7..34033289d0b6af1757928e00aff84d12f1fb768d 100644 GIT binary patch delta 61 zcmeyvxR!B3Foy`Qu%htQ?KdYzYiNmjx;TbNOid06zy9ZZ1G~Y)$uf3a3~kbkZDCt> S@i8zkFnGH9xvX_=j;qFbBVgiSp);Iv*!SYgDFqx;TbNOfBs_$aTPg!+G%==imRg%iU5k+ckM{ z&KpOAjHXLbr|((2u&8YOUbk%KLnGq}e`J)IvUM}k7L`nzDImC_V?oH2@X!~#KXT6P y{_Oix{ljt7V+ZC43o=eR;WMFS_u;#R%%y7Kp8}5e++<*2VDNPHb6Mw<&;$TZg+F5e diff --git a/scene/resources/default_theme/option_arrow.png b/scene/resources/default_theme/option_arrow.png index cd709a21fcb9f701cb57cb7c0be1d58214a7361b..b0ab74421a9d408919f23404f0dfe6c57c84f5f3 100644 GIT binary patch delta 59 zcmey#_>*yhmf?Sf{|x^Z>|H*Yfq{Xuz$3Dlfq`2Xgc%uT&5>YWU|=ut^mS#w$0@=q NqsQ`TTl>W5c>qM?5%>TA delta 59 zcmey#_>*yhmf>B7y9{@~igL_lU|`@Z@Q5sCVBi)8VMc~ob0ioT7}!fZeO=k_aSDjB N$a|=LRhk$*4*&ze5840# diff --git a/scene/resources/default_theme/popup_bg.png b/scene/resources/default_theme/popup_bg.png index 8e73474939c98bd16bb68c8562d558e5a5a15dd5..3afd0b13dd30f7e6490f391fe5f739b3605aa827 100644 GIT binary patch delta 233 zcmZ3>w1sIxaJ>khBC}?*j3@&G!$D6M#}JF&x0h|b4=0Em{TTnM_11$2VUyZ-d6>uB z&7ObceAw-qu9q&Hbu?*pf0XcS$%Uf_t>fPPl-HXRyx@rGx`M_-Kfe4p#(pnZz&@e% zv@oOWy$?dopU?ii`?z@3WhEsyM$6~>Zkos6zWa=Ged7U}t1I8^O7g4DaDTfxHFSy9 z)Z2H{`eyL{R#H+sdOdY!WFgumdKI;Vst0Hfz}vj6}9 delta 226 zcmdnOw3cZ?aJ`_AlvT#Hi_8oR47)sC978O6-(I%%V|Em1d6@6xEw|oG;hx}}hT}Ia zIMa>Ge44HqGB#~AIl+>%C;KEPqwKa_|AM?jIc3*fe9U$7&zujv{Cke8)E(gcG_#@0 ze9w_5HP!Xsf5fzH>gk%7kq kbrTC5XHMdN{fAj%xr_aswKu0RFfcH9y85}Sb4q9e0FsSrIRF3v diff --git a/scene/resources/default_theme/progress_fill.png b/scene/resources/default_theme/progress_fill.png index f3e589967c595782e877bf68158adb4956d60388..ee7c3315e495d1ee435e18ce29d6ade7d3c97dbd 100644 GIT binary patch delta 252 zcmbQuG>a*^Gr-TCmrII^fq{Y7)59f*fq_8)ggMw47#QR~|4(FKU|>t~c6VV=1HnlC zdnF7E44efXk;M!Q+`=Ht$S`Y;1Oo#Ddx@v7EBif85m7mfvy+;COpMm3Z}N0;46*2a zdqI)!umKP2h5aXW?6>Sam5_H~^E0+aYwyUEcFRjA9G-hkKF0Rz;pV@MjoRBemQHD3 z6=odW=T~&zGJoyX=NDDQR%E^1t6u*9gJn8X0OOi??lU=^#~B{HJ9#GP%kRw3$NwZU zo{V*ID-o1b`99hGgk?TMR*l5TkMksAIV&0U!t@Ro+`M;>fq{X+)78&qol`;+034!R AfdBvi delta 253 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 HQ$iB}$bNb) literal 1114 zcmeAS@N?(olHy`uVBq!ia0y~yU{C;I4mJh`hT^KKFANL}jKx9jP7LeL$-HD>U|>t~ zc6VX;4}uH!E}zW6z`$AH5n0T@z%2~Ij105pNH8!ku$OrHy0YKmVP-Nhb<;H2!@$6N z%hSa%B;xSV>9&2To`S9Wird|u&aRSr zJ-PEn@#E|Je_rjD`hPLp-fru+z>MRY-?L=gFLz^!|MP);yGV?GaOT?cmv8uQe(4|o ze`f9dol_q@7Q6M>!j9#6b3z{Di{}rn*Zi_Gc{XqRv0R4R%+ot&&UY-+e5zN(l(BNt z-L5z16dXi3E%$D}vc-C#^HEi$zPArAGv*xUGn=+5TT)l`*8!&$vw{{k%{05kyf7=h zWR;a)+M64FfBD$@nqM0{UDxocCn#mEkII?nOIJ2-+tjuA?dmH#uT0Zcx&H9C(}wrf zn+jJ-Ww~4ntV%f)z#Cc?zbZh*-7`G&`K6v4j=^e*KmKe+JuP@H*+r|4J?e^WzjMV~{ zH4M#k`Qc(-XWS7$`%;Zpry>zQ>}4WNy*_Y&Fhl4==W|2d9`m#NRXi8gAFmQtJ;ov9ez8{YQpihN2eZM zV|e(j!EQmQ+8r5HTL<^qj!n_-CmnK9`M=-nS<+#>Il;fpcgmR)c^RiM*ZTN-O?|qpcv;NMmX*A>)$R%? z@w~j&`gon!4C})Jdg@!W4zylfHEof=x^IlT7atD(D(qr8QB%4=P;OrJz0j_=uPbBt zY^>w9rtL46d?EEJvODd%_38I#`m9U^zI~nSUC6vQw>9_Qx9P_p6<%BXKjTK)?Jntd ziDR1=hcfPzWv~D7*j&F_Y3^Rt`Eyp-B|X@)Hs?V3{{MI5_tzXv{<$sZYNfH2Z9T)j zSo@g&(x?8PJ(2q7cIsYWU|=ut^mS#w$0@|1$q`v=>&(EwAX(xXQR1ARo12YWU|=ut^mS#w$0@|1$$g+C=O+ULgJg+oM2T~LZfCd@c?;J}2F4V=r2|D~Qx znlfR+kN?ll$MZyriKVqI_n+Tolz6d|iLJZorH;-So)YWU|=ut^mS#w$0@|XWWjmmLmLAFgJg+oM2T~LZfvQwNBQvB_mVJN0xGIW?O-klj|LnV_+UG3SY+W+tgyrH@3{!$8IA3&sR%yADGjY0v za;)_Q2A|98r!myphvolx;NP74`4gY>jn&!>hHUS{EAQ9rV8~me#367#K%Iesfx*+& K&t;ucLK6U$wo|15 diff --git a/scene/resources/default_theme/vscroll_grabber_hl.png b/scene/resources/default_theme/vscroll_grabber_hl.png deleted file mode 100644 index 440d2cc96177f54c685d973f5e228dd89149f15d..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 260 zcmeAS@N?(olHy`uVBq!ia0y~yVBi2@4mJh`h9ms@x)~T4*pj^6T^J@YOk$X+da$FA zfq{Xuz$3Dlfq`2Xgc%uT&5>YWU|=ut^mS#w$0@|XWLlouW6i+8AX(xXQR1ARo12wqV;us<^b#4Db-Ub5(mh~-p0lvD9j)!zC zbk_Cx7DU8cf5j%MlIwh60vl^v@%R7FTCYhh6}eZP)Z?Ma=%Fe2y;(@1rNQv?$=%`P*gbc1R`qeef2A?4ecRvj3=9kmp00i_ I>zopr0JLRR1poj5 diff --git a/scene/resources/default_theme/vslider_bg.png b/scene/resources/default_theme/vslider_bg.png index 6d841491636befadfe10f5e4a063ab174659f641..5472bb366f2421510a5c171fbd7cda4c61b6b6dc 100644 GIT binary patch delta 129 zcmaFH_>^&imf>B7y9{@~igL_lU|`@Z@Q5sCVBi)8VMc~ob0ioT7}!fZeO=k_afzdn!IMIok?f%sa~H#w%gUFrV>q{l7ow8hRup hB$fqdN#-&zM9z_T8L%X>ih+TF!PC{xWt~$(69C$PDCGbE delta 130 zcmaFL_>6Iamf=i>nG7@IT*4X|7#KJUJR*x37`TN&n2}-D90>*n2KEw9Usv{foPy%U zTIO%&q)&|2VDy{VqUcyx=P0tVU;e)Fo{Eo5&bGoA^NupQ@k*FBG&VLivbO*D(l38M hStZp=cQG#mgK(@s_=j;qFbBVg2FFjUjyDsdH7Zj)T^vIsrsnn;@*Pm%VU|7O{PX`Y1`V${C0b3Z z=ABRX&ejbToyjS9aHb(!)_Yl%`bJCjRUI)0INeyZJa_!g+bh5@!KJi(!jX8R&t^6D wInFLQZ!HtkR;=pUD(1qnbjs<3vFVdQ&MBb@0Om?I)&Kwi