Slider: Add bottom&top tick theme item

Author: beicause

doc/classes/Slider.xml

@@ -44,6 +44,12 @@
 		<theme_item name="grabber_offset" data_type="constant" type="int" default="0">
 			Vertical or horizontal offset of the grabber.
 		</theme_item>
+		<theme_item name="tick_bottom_offset" data_type="constant" type="int" default="2">
+			Vertical or horizontal offset of the bottom tick.
+		</theme_item>
+		<theme_item name="tick_top_offset" data_type="constant" type="int" default="2">
+			Vertical or horizontal offset of the top tick.
+		</theme_item>
 		<theme_item name="grabber" data_type="icon" type="Texture2D">
 			The texture for the grabber (the draggable element).
 		</theme_item>
@@ -53,8 +59,11 @@
 		<theme_item name="grabber_highlight" data_type="icon" type="Texture2D">
 			The texture for the grabber when it's focused.
 		</theme_item>
-		<theme_item name="tick" data_type="icon" type="Texture2D">
-			The texture for the ticks, visible when [member Slider.tick_count] is greater than 0.
+		<theme_item name="tick_bottom" data_type="icon" type="Texture2D">
+			The texture for the ticks in the bottom of the slider, visible when [member Slider.tick_count] is greater than 0.
+		</theme_item>
+		<theme_item name="tick_top" data_type="icon" type="Texture2D">
+			The texture for the ticks in the top of the slider, visible when [member Slider.tick_count] is greater than 0.
 		</theme_item>
 		<theme_item name="grabber_area" data_type="style" type="StyleBox">
 			The background of the area to the left or bottom of the grabber.

scene/gui/slider.cpp

@@ -267,7 +267,8 @@ void Slider::_notification(int p_what) {
 			double ratio = Math::is_nan(get_as_ratio()) ? 0 : get_as_ratio();
 
 			Ref<StyleBox> style = theme_cache.slider_style;
-			Ref<Texture2D> tick = theme_cache.tick_icon;
+			Ref<Texture2D> tick_bottom = theme_cache.tick_bottom_icon;
+			Ref<Texture2D> tick_top = theme_cache.tick_top_icon;
 
 			bool highlighted = editable && (mouse_inside || has_focus());
 			Ref<Texture2D> grabber;
@@ -296,13 +297,17 @@ void Slider::_notification(int p_what) {
 				grabber_area->draw(ci, Rect2i(Point2i((size.width - widget_width) / 2, Math::round(size.height - areasize * ratio - grabber->get_height() / 2 + grabber_shift)), Size2i(widget_width, Math::round(areasize * ratio + grabber->get_height() / 2 - grabber_shift))));
 
 				if (ticks > 1) {
-					int grabber_offset = (grabber->get_height() / 2 - tick->get_height() / 2);
+					int grabber_offset_bottom = (grabber->get_height() / 2 - tick_bottom->get_height() / 2);
+					int grabber_offset_top = (grabber->get_height() / 2 - tick_top->get_height() / 2);
 					for (int i = 0; i < ticks; i++) {
 						if (!ticks_on_borders && (i == 0 || i + 1 == ticks)) {
 							continue;
 						}
-						int ofs = (i * areasize / (ticks - 1)) + grabber_offset - grabber_shift;
-						tick->draw(ci, Point2i((size.width - widget_width) / 2, ofs));
+						int ofs_bottom = (i * areasize / (ticks - 1)) + grabber_offset_bottom - grabber_shift;
+						tick_bottom->draw(ci, Point2i(widget_width + (size.width - widget_width) / 2 + theme_cache.tick_bottom_offset, ofs_bottom));
+
+						int ofs_top = (i * areasize / (ticks - 1)) + grabber_offset_top - grabber_shift;
+						tick_top->draw(ci, Point2i((size.width - widget_width) / 2 - tick_top->get_width() - theme_cache.tick_top_offset, ofs_top));
 					}
 				}
 				grabber->draw(ci, Point2i(size.width / 2 - grabber->get_width() / 2 + theme_cache.grabber_offset, size.height - ratio * areasize - grabber->get_height() + grabber_shift));
@@ -321,13 +326,17 @@ void Slider::_notification(int p_what) {
 				}
 
 				if (ticks > 1) {
-					int grabber_offset = (grabber->get_width() / 2 - tick->get_width() / 2);
+					int grabber_offset_bottom = (grabber->get_width() / 2 - tick_bottom->get_width() / 2);
+					int grabber_offset_top = (grabber->get_width() / 2 - tick_top->get_width() / 2);
 					for (int i = 0; i < ticks; i++) {
 						if ((!ticks_on_borders) && ((i == 0) || ((i + 1) == ticks))) {
 							continue;
 						}
-						int ofs = (i * areasize / (ticks - 1)) + grabber_offset + grabber_shift;
-						tick->draw(ci, Point2i(ofs, (size.height - widget_height) / 2));
+						int ofs_bottom = (i * areasize / (ticks - 1)) + grabber_offset_bottom + grabber_shift;
+						tick_bottom->draw(ci, Point2i(ofs_bottom, widget_height + (size.height - widget_height) / 2 + theme_cache.tick_bottom_offset));
+
+						int ofs_top = (i * areasize / (ticks - 1)) + grabber_offset_top + grabber_shift;
+						tick_top->draw(ci, Point2i(ofs_top, (size.height - widget_height) / 2 - tick_top->get_height() - theme_cache.tick_top_offset));
 					}
 				}
 				grabber->draw(ci, Point2i((rtl ? 1 - ratio : ratio) * areasize + grabber_shift, size.height / 2 - grabber->get_height() / 2 + theme_cache.grabber_offset));
@@ -419,10 +428,13 @@ void Slider::_bind_methods() {
 	BIND_THEME_ITEM_CUSTOM(Theme::DATA_TYPE_ICON, Slider, grabber_icon, "grabber");
 	BIND_THEME_ITEM_CUSTOM(Theme::DATA_TYPE_ICON, Slider, grabber_hl_icon, "grabber_highlight");
 	BIND_THEME_ITEM_CUSTOM(Theme::DATA_TYPE_ICON, Slider, grabber_disabled_icon, "grabber_disabled");
-	BIND_THEME_ITEM_CUSTOM(Theme::DATA_TYPE_ICON, Slider, tick_icon, "tick");
+	BIND_THEME_ITEM_CUSTOM(Theme::DATA_TYPE_ICON, Slider, tick_bottom_icon, "tick_bottom");
+	BIND_THEME_ITEM_CUSTOM(Theme::DATA_TYPE_ICON, Slider, tick_top_icon, "tick_top");
 
 	BIND_THEME_ITEM(Theme::DATA_TYPE_CONSTANT, Slider, center_grabber);
 	BIND_THEME_ITEM(Theme::DATA_TYPE_CONSTANT, Slider, grabber_offset);
+	BIND_THEME_ITEM(Theme::DATA_TYPE_CONSTANT, Slider, tick_bottom_offset);
+	BIND_THEME_ITEM(Theme::DATA_TYPE_CONSTANT, Slider, tick_top_offset);
 }
 
 Slider::Slider(Orientation p_orientation) {

scene/gui/slider.h

@@ -61,10 +61,13 @@ class Slider : public Range {
 		Ref<Texture2D> grabber_icon;
 		Ref<Texture2D> grabber_hl_icon;
 		Ref<Texture2D> grabber_disabled_icon;
-		Ref<Texture2D> tick_icon;
+		Ref<Texture2D> tick_bottom_icon;
+		Ref<Texture2D> tick_top_icon;
 
 		bool center_grabber = false;
 		int grabber_offset = 0;
+		int tick_bottom_offset = 2;
+		int tick_top_offset = 2;
 	} theme_cache;
 
 protected:

scene/theme/default_theme.cpp

@@ -596,10 +596,13 @@ void fill_default_theme(Ref<Theme> &theme, const Ref<Font> &default_font, const
 	theme->set_icon("grabber", "HSlider", icons["slider_grabber"]);
 	theme->set_icon("grabber_highlight", "HSlider", icons["slider_grabber_hl"]);
 	theme->set_icon("grabber_disabled", "HSlider", icons["slider_grabber_disabled"]);
-	theme->set_icon("tick", "HSlider", icons["hslider_tick"]);
+	theme->set_icon("tick_bottom", "HSlider", icons["hslider_tick"]);
+	theme->set_icon("tick_top", "HSlider", empty_icon);
 
 	theme->set_constant("center_grabber", "HSlider", 0);
 	theme->set_constant("grabber_offset", "HSlider", 0);
+	theme->set_constant("tick_bottom_offset", "HSlider", 2);
+	theme->set_constant("tick_top_offset", "HSlider", 2);
 
 	// VSlider
 
@@ -610,10 +613,13 @@ void fill_default_theme(Ref<Theme> &theme, const Ref<Font> &default_font, const
 	theme->set_icon("grabber", "VSlider", icons["slider_grabber"]);
 	theme->set_icon("grabber_highlight", "VSlider", icons["slider_grabber_hl"]);
 	theme->set_icon("grabber_disabled", "VSlider", icons["slider_grabber_disabled"]);
-	theme->set_icon("tick", "VSlider", icons["vslider_tick"]);
+	theme->set_icon("tick_bottom", "VSlider", icons["vslider_tick"]);
+	theme->set_icon("tick_top", "VSlider", empty_icon);
 
 	theme->set_constant("center_grabber", "VSlider", 0);
 	theme->set_constant("grabber_offset", "VSlider", 0);
+	theme->set_constant("tick_bottom_offset", "VSlider", 2);
+	theme->set_constant("tick_top_offset", "VSlider", 2);
 
 	// SpinBox