Home Explore Help
Sign In
Godot
/
godot
mirror of https://github.com/godotengine/godot.git
2
0
Fork 0
Files Issues 0 Wiki
Browse Source

Merge pull request #37517 from nekomatata/slider-grab-area-highlight

Add style for highlighted Slider grab area
Rémi Verschelde 5 years ago
parent
d2b85ef642 4c8173af0f
commit
5566c5eb8d
3 changed files with 7 additions and 2 deletions
Split View Show Diff Stats
  1. 2 0
      editor/editor_themes.cpp
  2. 3 2
      scene/gui/slider.cpp
  3. 2 0
      scene/resources/default_theme/default_theme.cpp

+ 2 - 0
editor/editor_themes.cpp
View File 

@@ -961,12 +961,14 @@ Ref<Theme> create_editor_theme(const Ref<Theme> p_theme) {
 
 	theme->set_icon("grabber", "HSlider", theme->get_icon("GuiSliderGrabber", "EditorIcons"));
 
 	theme->set_stylebox("slider", "HSlider", make_flat_stylebox(dark_color_3, 0, default_margin_size / 2, 0, default_margin_size / 2));
 
 	theme->set_stylebox("grabber_area", "HSlider", make_flat_stylebox(contrast_color_1, 0, default_margin_size / 2, 0, default_margin_size / 2));
 
+	theme->set_stylebox("grabber_area_highlight", "HSlider", make_flat_stylebox(contrast_color_1, 0, default_margin_size / 2, 0, default_margin_size / 2));
 
 
 	// VSlider
 
 	theme->set_icon("grabber", "VSlider", theme->get_icon("GuiSliderGrabber", "EditorIcons"));
 
 	theme->set_icon("grabber_highlight", "VSlider", theme->get_icon("GuiSliderGrabberHl", "EditorIcons"));
 
 	theme->set_stylebox("slider", "VSlider", make_flat_stylebox(dark_color_3, default_margin_size / 2, 0, default_margin_size / 2, 0));
 
 	theme->set_stylebox("grabber_area", "VSlider", make_flat_stylebox(contrast_color_1, default_margin_size / 2, 0, default_margin_size / 2, 0));
 
+	theme->set_stylebox("grabber_area_highlight", "VSlider", make_flat_stylebox(contrast_color_1, default_margin_size / 2, 0, default_margin_size / 2, 0));
 
 
 	//RichTextLabel
 
 	theme->set_color("default_color", "RichTextLabel", font_color);

+ 3 - 2
scene/gui/slider.cpp
View File 

@@ -166,8 +166,9 @@ void Slider::_notification(int p_what) {
 
 			RID ci = get_canvas_item();
 
 			Size2i size = get_size();
 
 			Ref<StyleBox> style = get_theme_stylebox("slider");
 
-			Ref<StyleBox> grabber_area = get_theme_stylebox("grabber_area");
 
-			Ref<Texture2D> grabber = get_theme_icon(editable ? ((mouse_inside || has_focus()) ? "grabber_highlight" : "grabber") : "grabber_disabled");
 
+			bool highlighted = mouse_inside || has_focus();
 
+			Ref<StyleBox> grabber_area = get_theme_stylebox(highlighted ? "grabber_area_highlight" : "grabber_area");
 
+			Ref<Texture2D> grabber = get_theme_icon(editable ? (highlighted ? "grabber_highlight" : "grabber") : "grabber_disabled");
 
 			Ref<Texture2D> tick = get_theme_icon("tick");
 
 			double ratio = Math::is_nan(get_as_ratio()) ? 0 : get_as_ratio();

+ 2 - 0
scene/resources/default_theme/default_theme.cpp
View File 

@@ -497,6 +497,7 @@ void fill_default_theme(Ref<Theme> &theme, const Ref<Font> &default_font, const
 
 
 	theme->set_stylebox("slider", "HSlider", make_stylebox(hslider_bg_png, 4, 4, 4, 4));
 
 	theme->set_stylebox("grabber_area", "HSlider", make_stylebox(hslider_bg_png, 4, 4, 4, 4));
 
+	theme->set_stylebox("grabber_area_highlight", "HSlider", make_stylebox(hslider_bg_png, 4, 4, 4, 4));
 
 
 	theme->set_icon("grabber", "HSlider", make_icon(hslider_grabber_png));
 
 	theme->set_icon("grabber_highlight", "HSlider", make_icon(hslider_grabber_hl_png));
 
@@ -507,6 +508,7 @@ void fill_default_theme(Ref<Theme> &theme, const Ref<Font> &default_font, const
 
 
 	theme->set_stylebox("slider", "VSlider", make_stylebox(vslider_bg_png, 4, 4, 4, 4));
 
 	theme->set_stylebox("grabber_area", "VSlider", make_stylebox(vslider_bg_png, 4, 4, 4, 4));
 
+	theme->set_stylebox("grabber_area_highlight", "VSlider", make_stylebox(vslider_bg_png, 4, 4, 4, 4));
 
 
 	theme->set_icon("grabber", "VSlider", make_icon(vslider_grabber_png));
 
 	theme->set_icon("grabber_highlight", "VSlider", make_icon(vslider_grabber_hl_png));