Merge pull request #104444 from Delsin-Yu/fix-disabled-recursive-behavior-not-applied-on-ready

Repiteo · Repiteo · commit ba3482926daa · 2025-03-29T10:16:35.000-05:00
[GUI] Fix reparenting control does not update recursive mode cache properly
diff --git a/scene/gui/control.cpp b/scene/gui/control.cpp
@@ -1872,16 +1872,20 @@ void Control::set_mouse_recursive_behavior(RecursiveBehavior p_recursive_mouse_b
 	if (data.mouse_recursive_behavior == p_recursive_mouse_behavior) {
 		return;
 	}
+	_set_mouse_recursive_behavior_ignore_cache(p_recursive_mouse_behavior);
+}
+
+void Control::_set_mouse_recursive_behavior_ignore_cache(RecursiveBehavior p_recursive_mouse_behavior) {
 	data.mouse_recursive_behavior = p_recursive_mouse_behavior;
 	if (p_recursive_mouse_behavior == RECURSIVE_BEHAVIOR_INHERITED) {
 		Control *parent = get_parent_control();
 		if (parent) {
-			_apply_mouse_behavior_recursively(parent->data.parent_mouse_recursive_behavior, false);
+			_propagate_mouse_behavior_recursively(parent->data.parent_mouse_recursive_behavior, false);
 		} else {
-			_apply_mouse_behavior_recursively(RECURSIVE_BEHAVIOR_ENABLED, false);
+			_propagate_mouse_behavior_recursively(RECURSIVE_BEHAVIOR_ENABLED, false);
 		}
 	} else {
-		_apply_mouse_behavior_recursively(p_recursive_mouse_behavior, false);
+		_propagate_mouse_behavior_recursively(p_recursive_mouse_behavior, false);
 	}
 
 	if (get_viewport()) {
@@ -2056,16 +2060,20 @@ void Control::set_focus_recursive_behavior(RecursiveBehavior p_recursive_focus_b
 	if (data.focus_recursive_behavior == p_recursive_focus_behavior) {
 		return;
 	}
+	_set_focus_recursive_behavior_ignore_cache(p_recursive_focus_behavior);
+}
+
+void Control::_set_focus_recursive_behavior_ignore_cache(RecursiveBehavior p_recursive_focus_behavior) {
 	data.focus_recursive_behavior = p_recursive_focus_behavior;
 	if (p_recursive_focus_behavior == RECURSIVE_BEHAVIOR_INHERITED) {
 		Control *parent = get_parent_control();
 		if (parent) {
-			_apply_focus_behavior_recursively(parent->data.parent_focus_recursive_behavior, false);
+			_propagate_focus_behavior_recursively(parent->data.parent_focus_recursive_behavior, false);
 		} else {
-			_apply_focus_behavior_recursively(RECURSIVE_BEHAVIOR_ENABLED, false);
+			_propagate_focus_behavior_recursively(RECURSIVE_BEHAVIOR_ENABLED, false);
 		}
 	} else {
-		_apply_focus_behavior_recursively(p_recursive_focus_behavior, false);
+		_propagate_focus_behavior_recursively(p_recursive_focus_behavior, false);
 	}
 }
 
@@ -2441,7 +2449,7 @@ bool Control::_is_focus_disabled_recursively() const {
 	return false;
 }
 
-void Control::_apply_focus_behavior_recursively(RecursiveBehavior p_focus_recursive_behavior, bool p_skip_non_inherited) {
+void Control::_propagate_focus_behavior_recursively(RecursiveBehavior p_focus_recursive_behavior, bool p_skip_non_inherited) {
 	if (is_inside_tree() && (data.focus_recursive_behavior == RECURSIVE_BEHAVIOR_DISABLED || (data.focus_recursive_behavior == RECURSIVE_BEHAVIOR_INHERITED && p_focus_recursive_behavior == RECURSIVE_BEHAVIOR_DISABLED)) && has_focus()) {
 		release_focus();
 	}
@@ -2455,7 +2463,7 @@ void Control::_apply_focus_behavior_recursively(RecursiveBehavior p_focus_recurs
 	for (int i = 0; i < get_child_count(); i++) {
 		Control *control = Object::cast_to<Control>(get_child(i));
 		if (control) {
-			control->_apply_focus_behavior_recursively(p_focus_recursive_behavior, true);
+			control->_propagate_focus_behavior_recursively(p_focus_recursive_behavior, true);
 		}
 	}
 }
@@ -2472,7 +2480,7 @@ bool Control::_is_parent_mouse_disabled() const {
 	return false;
 }
 
-void Control::_apply_mouse_behavior_recursively(RecursiveBehavior p_mouse_recursive_behavior, bool p_skip_non_inherited) {
+void Control::_propagate_mouse_behavior_recursively(RecursiveBehavior p_mouse_recursive_behavior, bool p_skip_non_inherited) {
 	if (p_skip_non_inherited && data.mouse_recursive_behavior != RECURSIVE_BEHAVIOR_INHERITED) {
 		return;
 	}
@@ -2482,7 +2490,7 @@ void Control::_apply_mouse_behavior_recursively(RecursiveBehavior p_mouse_recurs
 	for (int i = 0; i < get_child_count(); i++) {
 		Control *control = Object::cast_to<Control>(get_child(i));
 		if (control) {
-			control->_apply_mouse_behavior_recursively(p_mouse_recursive_behavior, true);
+			control->_propagate_mouse_behavior_recursively(p_mouse_recursive_behavior, true);
 		}
 	}
 }
@@ -3442,8 +3450,8 @@ void Control::_notification(int p_notification) {
 
 			_update_layout_mode();
 
-			set_focus_recursive_behavior(data.focus_recursive_behavior);
-			set_mouse_recursive_behavior(data.mouse_recursive_behavior);
+			_set_focus_recursive_behavior_ignore_cache(data.focus_recursive_behavior);
+			_set_mouse_recursive_behavior_ignore_cache(data.mouse_recursive_behavior);
 		} break;
 
 		case NOTIFICATION_UNPARENTED: {
diff --git a/scene/gui/control.h b/scene/gui/control.h
@@ -330,8 +330,10 @@ class Control : public CanvasItem {
 	void _window_find_focus_neighbor(const Vector2 &p_dir, Node *p_at, const Rect2 &p_rect, const Rect2 &p_clamp, real_t p_min, real_t &r_closest_dist_squared, Control **r_closest);
 	Control *_get_focus_neighbor(Side p_side, int p_count = 0);
 	bool _is_focus_disabled_recursively() const;
-	void _apply_focus_behavior_recursively(RecursiveBehavior p_focus_recursive_behavior, bool p_force);
-	void _apply_mouse_behavior_recursively(RecursiveBehavior p_focus_recursive_behavior, bool p_force);
+	void _propagate_focus_behavior_recursively(RecursiveBehavior p_focus_recursive_behavior, bool p_force);
+	void _propagate_mouse_behavior_recursively(RecursiveBehavior p_focus_recursive_behavior, bool p_force);
+	void _set_mouse_recursive_behavior_ignore_cache(RecursiveBehavior p_recursive_mouse_behavior);
+	void _set_focus_recursive_behavior_ignore_cache(RecursiveBehavior p_recursive_mouse_behavior);
 
 	// Theming.
 

Original file line number	Diff line number	Diff line change
`@@ -1872,16 +1872,20 @@ void Control::set_mouse_recursive_behavior(RecursiveBehavior p_recursive_mouse_b`
`1872`	`1872`	`if (data.mouse_recursive_behavior == p_recursive_mouse_behavior) {`
`1873`	`1873`	`return;`
`1874`	`1874`	`}`
	`1875`	`+ _set_mouse_recursive_behavior_ignore_cache(p_recursive_mouse_behavior);`
	`1876`	`+}`
	`1877`	`+`
	`1878`	`+void Control::_set_mouse_recursive_behavior_ignore_cache(RecursiveBehavior p_recursive_mouse_behavior) {`
`1875`	`1879`	`data.mouse_recursive_behavior = p_recursive_mouse_behavior;`
`1876`	`1880`	`if (p_recursive_mouse_behavior == RECURSIVE_BEHAVIOR_INHERITED) {`
`1877`	`1881`	`Control *parent = get_parent_control();`
`1878`	`1882`	`if (parent) {`
`1879`		`- _apply_mouse_behavior_recursively(parent->data.parent_mouse_recursive_behavior, false);`
	`1883`	`+ _propagate_mouse_behavior_recursively(parent->data.parent_mouse_recursive_behavior, false);`
`1880`	`1884`	`} else {`
`1881`		`- _apply_mouse_behavior_recursively(RECURSIVE_BEHAVIOR_ENABLED, false);`
	`1885`	`+ _propagate_mouse_behavior_recursively(RECURSIVE_BEHAVIOR_ENABLED, false);`
`1882`	`1886`	`}`
`1883`	`1887`	`} else {`
`1884`		`- _apply_mouse_behavior_recursively(p_recursive_mouse_behavior, false);`
	`1888`	`+ _propagate_mouse_behavior_recursively(p_recursive_mouse_behavior, false);`
`1885`	`1889`	`}`
`1886`	`1890`
`1887`	`1891`	`if (get_viewport()) {`
`@@ -2056,16 +2060,20 @@ void Control::set_focus_recursive_behavior(RecursiveBehavior p_recursive_focus_b`
`2056`	`2060`	`if (data.focus_recursive_behavior == p_recursive_focus_behavior) {`
`2057`	`2061`	`return;`
`2058`	`2062`	`}`
	`2063`	`+ _set_focus_recursive_behavior_ignore_cache(p_recursive_focus_behavior);`
	`2064`	`+}`
	`2065`	`+`
	`2066`	`+void Control::_set_focus_recursive_behavior_ignore_cache(RecursiveBehavior p_recursive_focus_behavior) {`
`2059`	`2067`	`data.focus_recursive_behavior = p_recursive_focus_behavior;`
`2060`	`2068`	`if (p_recursive_focus_behavior == RECURSIVE_BEHAVIOR_INHERITED) {`
`2061`	`2069`	`Control *parent = get_parent_control();`
`2062`	`2070`	`if (parent) {`
`2063`		`- _apply_focus_behavior_recursively(parent->data.parent_focus_recursive_behavior, false);`
	`2071`	`+ _propagate_focus_behavior_recursively(parent->data.parent_focus_recursive_behavior, false);`
`2064`	`2072`	`} else {`
`2065`		`- _apply_focus_behavior_recursively(RECURSIVE_BEHAVIOR_ENABLED, false);`
	`2073`	`+ _propagate_focus_behavior_recursively(RECURSIVE_BEHAVIOR_ENABLED, false);`
`2066`	`2074`	`}`
`2067`	`2075`	`} else {`
`2068`		`- _apply_focus_behavior_recursively(p_recursive_focus_behavior, false);`
	`2076`	`+ _propagate_focus_behavior_recursively(p_recursive_focus_behavior, false);`
`2069`	`2077`	`}`
`2070`	`2078`	`}`
`2071`	`2079`
`@@ -2441,7 +2449,7 @@ bool Control::_is_focus_disabled_recursively() const {`
`2441`	`2449`	`return false;`
`2442`	`2450`	`}`
`2443`	`2451`
`2444`		`-void Control::_apply_focus_behavior_recursively(RecursiveBehavior p_focus_recursive_behavior, bool p_skip_non_inherited) {`
	`2452`	`+void Control::_propagate_focus_behavior_recursively(RecursiveBehavior p_focus_recursive_behavior, bool p_skip_non_inherited) {`
`2445`	`2453`	`if (is_inside_tree() && (data.focus_recursive_behavior == RECURSIVE_BEHAVIOR_DISABLED \|\| (data.focus_recursive_behavior == RECURSIVE_BEHAVIOR_INHERITED && p_focus_recursive_behavior == RECURSIVE_BEHAVIOR_DISABLED)) && has_focus()) {`
`2446`	`2454`	`release_focus();`
`2447`	`2455`	`}`
`@@ -2455,7 +2463,7 @@ void Control::_apply_focus_behavior_recursively(RecursiveBehavior p_focus_recurs`
`2455`	`2463`	`for (int i = 0; i < get_child_count(); i++) {`
`2456`	`2464`	`Control *control = Object::cast_to<Control>(get_child(i));`
`2457`	`2465`	`if (control) {`
`2458`		`- control->_apply_focus_behavior_recursively(p_focus_recursive_behavior, true);`
	`2466`	`+ control->_propagate_focus_behavior_recursively(p_focus_recursive_behavior, true);`
`2459`	`2467`	`}`
`2460`	`2468`	`}`
`2461`	`2469`	`}`
`@@ -2472,7 +2480,7 @@ bool Control::_is_parent_mouse_disabled() const {`
`2472`	`2480`	`return false;`
`2473`	`2481`	`}`
`2474`	`2482`
`2475`		`-void Control::_apply_mouse_behavior_recursively(RecursiveBehavior p_mouse_recursive_behavior, bool p_skip_non_inherited) {`
	`2483`	`+void Control::_propagate_mouse_behavior_recursively(RecursiveBehavior p_mouse_recursive_behavior, bool p_skip_non_inherited) {`
`2476`	`2484`	`if (p_skip_non_inherited && data.mouse_recursive_behavior != RECURSIVE_BEHAVIOR_INHERITED) {`
`2477`	`2485`	`return;`
`2478`	`2486`	`}`
`@@ -2482,7 +2490,7 @@ void Control::_apply_mouse_behavior_recursively(RecursiveBehavior p_mouse_recurs`
`2482`	`2490`	`for (int i = 0; i < get_child_count(); i++) {`
`2483`	`2491`	`Control *control = Object::cast_to<Control>(get_child(i));`
`2484`	`2492`	`if (control) {`
`2485`		`- control->_apply_mouse_behavior_recursively(p_mouse_recursive_behavior, true);`
	`2493`	`+ control->_propagate_mouse_behavior_recursively(p_mouse_recursive_behavior, true);`
`2486`	`2494`	`}`
`2487`	`2495`	`}`
`2488`	`2496`	`}`
`@@ -3442,8 +3450,8 @@ void Control::_notification(int p_notification) {`
`3442`	`3450`
`3443`	`3451`	`_update_layout_mode();`
`3444`	`3452`
`3445`		`- set_focus_recursive_behavior(data.focus_recursive_behavior);`
`3446`		`- set_mouse_recursive_behavior(data.mouse_recursive_behavior);`
	`3453`	`+ _set_focus_recursive_behavior_ignore_cache(data.focus_recursive_behavior);`
	`3454`	`+ _set_mouse_recursive_behavior_ignore_cache(data.mouse_recursive_behavior);`
`3447`	`3455`	`} break;`
`3448`	`3456`
`3449`	`3457`	`case NOTIFICATION_UNPARENTED: {`