From e2e8457ca61dee58dc5edc47593fd628bacd1e57 Mon Sep 17 00:00:00 2001
From: mawenzy <mawenzy@users.noreply.github.com>
Date: Tue, 9 Apr 2019 21:58:19 +0200
Subject: [PATCH] Fix #24124, Slider control size

---
 scene/gui/slider.cpp | 15 +++++++++++++--
 1 file changed, 13 insertions(+), 2 deletions(-)

diff --git a/scene/gui/slider.cpp b/scene/gui/slider.cpp
index eb04b859314..028ca41cbfd 100644
--- a/scene/gui/slider.cpp
+++ b/scene/gui/slider.cpp
@@ -34,8 +34,15 @@
 Size2 Slider::get_minimum_size() const {
 
 	Ref<StyleBox> style = get_stylebox("slider");
-	Size2i ms = style->get_minimum_size() + style->get_center_size();
-	return ms;
+	Size2i ss = style->get_minimum_size() + style->get_center_size();
+
+	Ref<Texture> grabber = get_icon("grabber");
+	Size2i rs = grabber->get_size();
+
+	if (orientation == HORIZONTAL)
+		return Size2i(ss.width, MAX(ss.height, rs.height));
+	else
+		return Size2i(MAX(ss.width, rs.width), ss.height);
 }
 
 void Slider::_gui_input(Ref<InputEvent> p_event) {
@@ -134,7 +141,11 @@ void Slider::_gui_input(Ref<InputEvent> p_event) {
 void Slider::_notification(int p_what) {
 
 	switch (p_what) {
+		case NOTIFICATION_THEME_CHANGED: {
 
+			minimum_size_changed();
+			update();
+		} break;
 		case NOTIFICATION_MOUSE_ENTER: {
 
 			mouse_inside = true;