1 files changed, 167 insertions, 158 deletions

diff --git a/scene/gui/split_container.cpp b/scene/gui/split_container.cpp
index 04bd5b3282..2ca1d6239e 100644
--- a/scene/gui/split_container.cpp
+++ b/scene/gui/split_container.cpp
@@ -33,11 +33,99 @@
 #include "label.h"
 #include "margin_container.h"
 
+void SplitContainerDragger::gui_input(const Ref<InputEvent> &p_event) {
+	ERR_FAIL_COND(p_event.is_null());
+
+	SplitContainer *sc = Object::cast_to<SplitContainer>(get_parent());
+
+	if (sc->collapsed || !sc->_getch(0) || !sc->_getch(1) || sc->dragger_visibility != SplitContainer::DRAGGER_VISIBLE) {
+		return;
+	}
+
+	Ref<InputEventMouseButton> mb = p_event;
+
+	if (mb.is_valid()) {
+		if (mb->get_button_index() == MouseButton::LEFT) {
+			if (mb->is_pressed()) {
+				sc->_compute_middle_sep(true);
+				dragging = true;
+				drag_ofs = sc->split_offset;
+				if (sc->vertical) {
+					drag_from = get_transform().xform(mb->get_position()).y;
+				} else {
+					drag_from = get_transform().xform(mb->get_position()).x;
+				}
+			} else {
+				dragging = false;
+				queue_redraw();
+			}
+		}
+	}
+
+	Ref<InputEventMouseMotion> mm = p_event;
+
+	if (mm.is_valid()) {
+		if (!dragging) {
+			return;
+		}
+
+		Vector2i in_parent_pos = get_transform().xform(mm->get_position());
+		if (!sc->vertical && is_layout_rtl()) {
+			sc->split_offset = drag_ofs - ((sc->vertical ? in_parent_pos.y : in_parent_pos.x) - drag_from);
+		} else {
+			sc->split_offset = drag_ofs + ((sc->vertical ? in_parent_pos.y : in_parent_pos.x) - drag_from);
+		}
+		sc->_compute_middle_sep(true);
+		sc->queue_sort();
+		sc->emit_signal(SNAME("dragged"), sc->get_split_offset());
+	}
+}
+
+Control::CursorShape SplitContainerDragger::get_cursor_shape(const Point2 &p_pos) const {
+	SplitContainer *sc = Object::cast_to<SplitContainer>(get_parent());
+
+	if (!sc->collapsed && sc->dragger_visibility == SplitContainer::DRAGGER_VISIBLE) {
+		return (sc->vertical ? CURSOR_VSPLIT : CURSOR_HSPLIT);
+	}
+
+	return Control::get_cursor_shape(p_pos);
+}
+
+void SplitContainerDragger::_notification(int p_what) {
+	switch (p_what) {
+		case NOTIFICATION_MOUSE_ENTER: {
+			mouse_inside = true;
+			SplitContainer *sc = Object::cast_to<SplitContainer>(get_parent());
+			if (sc->get_theme_constant(SNAME("autohide"))) {
+				queue_redraw();
+			}
+		} break;
+
+		case NOTIFICATION_MOUSE_EXIT: {
+			mouse_inside = false;
+			SplitContainer *sc = Object::cast_to<SplitContainer>(get_parent());
+			if (sc->get_theme_constant(SNAME("autohide"))) {
+				queue_redraw();
+			}
+		} break;
+
+		case NOTIFICATION_DRAW: {
+			SplitContainer *sc = Object::cast_to<SplitContainer>(get_parent());
+			if (!dragging && !mouse_inside && sc->get_theme_constant(SNAME("autohide"))) {
+				return;
+			}
+
+			Ref<Texture2D> tex = sc->get_theme_icon(SNAME("grabber"));
+			draw_texture(tex, (get_size() - tex->get_size()) / 2);
+		} break;
+	}
+}
+
 Control *SplitContainer::_getch(int p_idx) const {
 	int idx = 0;
 
-	for (int i = 0; i < get_child_count(); i++) {
-		Control *c = Object::cast_to<Control>(get_child(i));
+	for (int i = 0; i < get_child_count(false); i++) {
+		Control *c = Object::cast_to<Control>(get_child(i, false));
 		if (!c || !c->is_visible()) {
 			continue;
 		}
@@ -67,57 +155,72 @@ Ref<Texture2D> SplitContainer::_get_grabber_icon() const {
 	}
 }
 
-void SplitContainer::_resort() {
-	int axis = vertical ? 1 : 0;
-
+void SplitContainer::_compute_middle_sep(bool p_clamp) {
 	Control *first = _getch(0);
 	Control *second = _getch(1);
 
-	// If we have only one element
-	if (!first || !second) {
-		if (first) {
-			fit_child_in_rect(first, Rect2(Point2(), get_size()));
-		} else if (second) {
-			fit_child_in_rect(second, Rect2(Point2(), get_size()));
-		}
-		return;
-	}
-
-	// Determine expanded children
+	// Determine expanded children.
 	bool first_expanded = (vertical ? first->get_v_size_flags() : first->get_h_size_flags()) & SIZE_EXPAND;
 	bool second_expanded = (vertical ? second->get_v_size_flags() : second->get_h_size_flags()) & SIZE_EXPAND;
 
-	// Determine the separation between items
+	// Compute the minimum size.
+	int axis = vertical ? 1 : 0;
+	int size = get_size()[axis];
+	int ms_first = first->get_combined_minimum_size()[axis];
+	int ms_second = second->get_combined_minimum_size()[axis];
+
+	// Determine the separation between items.
 	Ref<Texture2D> g = _get_grabber_icon();
 	int sep = (dragger_visibility != DRAGGER_HIDDEN_COLLAPSED) ? MAX(theme_cache.separation, vertical ? g->get_height() : g->get_width()) : 0;
 
-	// Compute the minimum size
-	Size2 ms_first = first->get_combined_minimum_size();
-	Size2 ms_second = second->get_combined_minimum_size();
-
-	// Compute the separator position without the split offset
-	float ratio = first->get_stretch_ratio() / (first->get_stretch_ratio() + second->get_stretch_ratio());
-	int no_offset_middle_sep = 0;
+	// Compute the wished separation_point.
+	int wished_middle_sep = 0;
+	int split_offset_with_collapse = 0;
+	if (!collapsed) {
+		split_offset_with_collapse = split_offset;
+	}
 	if (first_expanded && second_expanded) {
-		no_offset_middle_sep = get_size()[axis] * ratio - sep / 2;
+		float ratio = first->get_stretch_ratio() / (first->get_stretch_ratio() + second->get_stretch_ratio());
+		wished_middle_sep = size * ratio - sep / 2 + split_offset_with_collapse;
 	} else if (first_expanded) {
-		no_offset_middle_sep = get_size()[axis] - ms_second[axis] - sep;
+		wished_middle_sep = size - sep + split_offset_with_collapse;
 	} else {
-		no_offset_middle_sep = ms_first[axis];
+		wished_middle_sep = split_offset_with_collapse;
 	}
 
-	// Compute the final middle separation.
-	middle_sep = no_offset_middle_sep;
-	if (!collapsed) {
-		int clamped_split_offset = CLAMP(split_offset, ms_first[axis] - no_offset_middle_sep, (get_size()[axis] - ms_second[axis] - sep) - no_offset_middle_sep);
-		middle_sep += clamped_split_offset;
-		if (should_clamp_split_offset) {
-			split_offset = clamped_split_offset;
+	// Clamp the middle sep to acceptatble values.
+	middle_sep = CLAMP(wished_middle_sep, ms_first, size - sep - ms_second);
+
+	// Clamp the split_offset if requested.
+	if (p_clamp) {
+		split_offset -= wished_middle_sep - middle_sep;
+		p_clamp = false;
+	}
+}
+
+void SplitContainer::_resort() {
+	Control *first = _getch(0);
+	Control *second = _getch(1);
 
-			should_clamp_split_offset = false;
+	// If we have only one element.
+	if (!first || !second) {
+		if (first) {
+			fit_child_in_rect(first, Rect2(Point2(), get_size()));
+		} else if (second) {
+			fit_child_in_rect(second, Rect2(Point2(), get_size()));
 		}
+		dragging_area_control->hide();
+		return;
 	}
 
+	// If we have more that one.
+	_compute_middle_sep(false);
+
+	// Determine the separation between items.
+	Ref<Texture2D> g = _get_grabber_icon();
+	int sep = (dragger_visibility != DRAGGER_HIDDEN_COLLAPSED) ? MAX(theme_cache.separation, vertical ? g->get_height() : g->get_width()) : 0;
+
+	// Move the children, including the dragger.
 	if (vertical) {
 		fit_child_in_rect(first, Rect2(Point2(0, 0), Size2(get_size().width, middle_sep)));
 		int sofs = middle_sep + sep;
@@ -135,7 +238,21 @@ void SplitContainer::_resort() {
 		}
 	}
 
-	queue_redraw();
+	// Handle the dragger visibility and position.
+	if (dragger_visibility == DRAGGER_VISIBLE && !collapsed) {
+		dragging_area_control->show();
+
+		int dragger_ctrl_size = MAX(sep, theme_cache.minimum_grab_thickness);
+		if (vertical) {
+			dragging_area_control->set_rect(Rect2(Point2(0, middle_sep - (dragger_ctrl_size - sep) / 2), Size2(get_size().width, dragger_ctrl_size)));
+		} else {
+			dragging_area_control->set_rect(Rect2(Point2(middle_sep - (dragger_ctrl_size - sep) / 2, 0), Size2(dragger_ctrl_size, get_size().height)));
+		}
+
+		dragging_area_control->queue_redraw();
+	} else {
+		dragging_area_control->hide();
+	}
 }
 
 Size2 SplitContainer::get_minimum_size() const {
@@ -170,10 +287,17 @@ Size2 SplitContainer::get_minimum_size() const {
 	return minimum;
 }
 
+void SplitContainer::_validate_property(PropertyInfo &p_property) const {
+	if (is_fixed && p_property.name == "vertical") {
+		p_property.usage = PROPERTY_USAGE_NONE;
+	}
+}
+
 void SplitContainer::_update_theme_item_cache() {
 	Container::_update_theme_item_cache();
 
 	theme_cache.separation = get_theme_constant(SNAME("separation"));
+	theme_cache.minimum_grab_thickness = get_theme_constant(SNAME("minimum_grab_thickness"));
 	theme_cache.autohide = get_theme_constant(SNAME("autohide"));
 	theme_cache.grabber_icon = get_theme_icon(SNAME("grabber"));
 	theme_cache.grabber_icon_h = get_theme_icon(SNAME("h_grabber"));
@@ -191,132 +315,12 @@ void SplitContainer::_notification(int p_what) {
 			_resort();
 		} break;
 
-		case NOTIFICATION_MOUSE_EXIT: {
-			mouse_inside = false;
-			if (theme_cache.autohide) {
-				queue_redraw();
-			}
-		} break;
-
-		case NOTIFICATION_DRAW: {
-			if (!_getch(0) || !_getch(1)) {
-				return;
-			}
-
-			if (collapsed || (!dragging && !mouse_inside && theme_cache.autohide)) {
-				return;
-			}
-
-			if (dragger_visibility != DRAGGER_VISIBLE) {
-				return;
-			}
-
-			int sep = dragger_visibility != DRAGGER_HIDDEN_COLLAPSED ? theme_cache.separation : 0;
-			Ref<Texture2D> tex = theme_cache.grabber_icon;
-			Size2 size = get_size();
-
-			if (vertical) {
-				draw_texture(tex, Point2i((size.x - tex->get_width()) / 2, middle_sep + (sep - tex->get_height()) / 2));
-			} else {
-				draw_texture(tex, Point2i(middle_sep + (sep - tex->get_width()) / 2, (size.y - tex->get_height()) / 2));
-			}
-		} break;
-
 		case NOTIFICATION_THEME_CHANGED: {
 			update_minimum_size();
 		} break;
 	}
 }
 
-void SplitContainer::_validate_property(PropertyInfo &p_property) const {
-	if (is_fixed && p_property.name == "vertical") {
-		p_property.usage = PROPERTY_USAGE_NONE;
-	}
-}
-
-void SplitContainer::gui_input(const Ref<InputEvent> &p_event) {
-	ERR_FAIL_COND(p_event.is_null());
-
-	if (collapsed || !_getch(0) || !_getch(1) || dragger_visibility != DRAGGER_VISIBLE) {
-		return;
-	}
-
-	Ref<InputEventMouseButton> mb = p_event;
-
-	if (mb.is_valid()) {
-		if (mb->get_button_index() == MouseButton::LEFT) {
-			if (mb->is_pressed()) {
-				if (vertical) {
-					if (mb->get_position().y > middle_sep && mb->get_position().y < middle_sep + theme_cache.separation) {
-						dragging = true;
-						drag_from = mb->get_position().y;
-						drag_ofs = split_offset;
-					}
-				} else {
-					if (mb->get_position().x > middle_sep && mb->get_position().x < middle_sep + theme_cache.separation) {
-						dragging = true;
-						drag_from = mb->get_position().x;
-						drag_ofs = split_offset;
-					}
-				}
-			} else {
-				dragging = false;
-			}
-		}
-	}
-
-	Ref<InputEventMouseMotion> mm = p_event;
-
-	if (mm.is_valid()) {
-		bool mouse_inside_state = false;
-		if (vertical) {
-			mouse_inside_state = mm->get_position().y > middle_sep && mm->get_position().y < middle_sep + theme_cache.separation;
-		} else {
-			mouse_inside_state = mm->get_position().x > middle_sep && mm->get_position().x < middle_sep + theme_cache.separation;
-		}
-
-		if (mouse_inside != mouse_inside_state) {
-			mouse_inside = mouse_inside_state;
-			if (theme_cache.autohide) {
-				queue_redraw();
-			}
-		}
-
-		if (!dragging) {
-			return;
-		}
-
-		if (!vertical && is_layout_rtl()) {
-			split_offset = drag_ofs + (drag_from - (vertical ? mm->get_position().y : mm->get_position().x));
-		} else {
-			split_offset = drag_ofs + ((vertical ? mm->get_position().y : mm->get_position().x) - drag_from);
-		}
-		should_clamp_split_offset = true;
-		queue_sort();
-		emit_signal(SNAME("dragged"), get_split_offset());
-	}
-}
-
-Control::CursorShape SplitContainer::get_cursor_shape(const Point2 &p_pos) const {
-	if (dragging) {
-		return (vertical ? CURSOR_VSPLIT : CURSOR_HSPLIT);
-	}
-
-	if (!collapsed && _getch(0) && _getch(1) && dragger_visibility == DRAGGER_VISIBLE) {
-		if (vertical) {
-			if (p_pos.y > middle_sep && p_pos.y < middle_sep + theme_cache.separation) {
-				return CURSOR_VSPLIT;
-			}
-		} else {
-			if (p_pos.x > middle_sep && p_pos.x < middle_sep + theme_cache.separation) {
-				return CURSOR_HSPLIT;
-			}
-		}
-	}
-
-	return Control::get_cursor_shape(p_pos);
-}
-
 void SplitContainer::set_split_offset(int p_offset) {
 	if (split_offset == p_offset) {
 		return;
@@ -332,8 +336,11 @@ int SplitContainer::get_split_offset() const {
 }
 
 void SplitContainer::clamp_split_offset() {
-	should_clamp_split_offset = true;
+	if (!_getch(0) || !_getch(1)) {
+		return;
+	}
 
+	_compute_middle_sep(true);
 	queue_sort();
 }
 
@@ -353,7 +360,6 @@ void SplitContainer::set_dragger_visibility(DraggerVisibility p_visibility) {
 
 	dragger_visibility = p_visibility;
 	queue_sort();
-	queue_redraw();
 }
 
 SplitContainer::DraggerVisibility SplitContainer::get_dragger_visibility() const {
@@ -427,4 +433,7 @@ void SplitContainer::_bind_methods() {
 
 SplitContainer::SplitContainer(bool p_vertical) {
 	vertical = p_vertical;
+
+	dragging_area_control = memnew(SplitContainerDragger);
+	add_child(dragging_area_control, false, Node::INTERNAL_MODE_BACK);
 }