Hide Control focus when given via mouse input

YeldhamDev · YeldhamDev · commit 11b72df365ae · 2025-09-03T21:28:16.000-03:00
diff --git a/doc/classes/Control.xml b/doc/classes/Control.xml
@@ -618,15 +618,19 @@
 		</method>
 		<method name="grab_focus">
 			<return type="void" />
+			<param index="0" name="hide_focus" type="bool" default="false" />
 			<description>
 				Steal the focus from another control and become the focused control (see [member focus_mode]).
+				If [param hide_focus] is [code]true[/code], the control will not visually show its focused state.
 				[b]Note:[/b] Using this method together with [method Callable.call_deferred] makes it more reliable, especially when called inside [method Node._ready].
 			</description>
 		</method>
 		<method name="has_focus" qualifiers="const">
 			<return type="bool" />
+			<param index="0" name="ignore_hidden_focus" type="bool" default="false" />
 			<description>
 				Returns [code]true[/code] if this is the current focused control. See [member focus_mode].
+				If [param ignore_hidden_focus] is [code]true[/code], controls that have its focus hidden will always return [code]false[/code]. Hidden focus happens automatically when controls gain focus via mouse input, or manually with [method grab_focus] with [code]hide_focus[/code] set to [code]true[/code].
 			</description>
 		</method>
 		<method name="has_theme_color" qualifiers="const">
diff --git a/editor/gui/editor_spin_slider.cpp b/editor/gui/editor_spin_slider.cpp
@@ -340,7 +340,7 @@ void EditorSpinSlider::_draw_spin_slider() {
 		}
 	}
 
-	if (has_focus()) {
+	if (has_focus(true)) {
 		Ref<StyleBox> focus = get_theme_stylebox(SNAME("focus"), SNAME("LineEdit"));
 		draw_style_box(focus, Rect2(Vector2(), size));
 	}
diff --git a/editor/scene/canvas_item_editor_plugin.cpp b/editor/scene/canvas_item_editor_plugin.cpp
@@ -2797,7 +2797,7 @@ void CanvasItemEditor::_gui_input_viewport(const Ref<InputEvent> &p_event) {
 
 	// Grab focus
 	if (!viewport->has_focus() && (!get_viewport()->gui_get_focus_owner() || !get_viewport()->gui_get_focus_owner()->is_text_field())) {
-		callable_mp((Control *)viewport, &Control::grab_focus).call_deferred();
+		callable_mp((Control *)viewport, &Control::grab_focus).call_deferred(false);
 	}
 }
 
diff --git a/scene/gui/button.cpp b/scene/gui/button.cpp
@@ -251,7 +251,7 @@ void Button::_notification(int p_what) {
 				style->draw(ci, Rect2(Point2(), size));
 			}
 
-			if (has_focus()) {
+			if (has_focus(true)) {
 				theme_cache.focus->draw(ci, Rect2(Point2(), size));
 			}
 
@@ -315,7 +315,7 @@ void Button::_notification(int p_what) {
 			switch (get_draw_mode()) {
 				case DRAW_NORMAL: {
 					// Focus colors only take precedence over normal state.
-					if (has_focus()) {
+					if (has_focus(true)) {
 						font_color = theme_cache.font_focus_color;
 						if (has_theme_color(SNAME("icon_focus_color"))) {
 							icon_modulate_color = theme_cache.icon_focus_color;
diff --git a/scene/gui/color_picker.cpp b/scene/gui/color_picker.cpp
@@ -1491,7 +1491,7 @@ void ColorPicker::_sample_draw() {
 
 	sample->draw_rect(rect_new, color);
 
-	if (display_old_color && !old_color.is_equal_approx(color) && sample->has_focus()) {
+	if (display_old_color && !old_color.is_equal_approx(color) && sample->has_focus(true)) {
 		RID ci = sample->get_canvas_item();
 		theme_cache.sample_focus->draw(ci, rect_old);
 	}
@@ -2663,7 +2663,7 @@ void ColorPresetButton::_notification(int p_what) {
 				WARN_PRINT("Unsupported StyleBox used for ColorPresetButton. Use StyleBoxFlat or StyleBoxTexture instead.");
 			}
 
-			if (has_focus()) {
+			if (has_focus(true)) {
 				RID ci = get_canvas_item();
 				theme_cache.focus_style->draw(ci, Rect2(Point2(), get_size()));
 			}
diff --git a/scene/gui/color_picker_shape.cpp b/scene/gui/color_picker_shape.cpp
@@ -84,7 +84,7 @@ void ColorPickerShape::cancel_event() {
 }
 
 void ColorPickerShape::draw_focus_rect(Control *p_control, const Rect2 &p_rect) {
-	if (!p_control->has_focus()) {
+	if (!p_control->has_focus(true)) {
 		return;
 	}
 
@@ -103,7 +103,7 @@ void ColorPickerShape::draw_focus_rect(Control *p_control, const Rect2 &p_rect)
 }
 
 void ColorPickerShape::draw_focus_circle(Control *p_control) {
-	if (!p_control->has_focus()) {
+	if (!p_control->has_focus(true)) {
 		return;
 	}
 
diff --git a/scene/gui/control.cpp b/scene/gui/control.cpp
@@ -2315,12 +2315,12 @@ void Control::_propagate_focus_behavior_recursive_recursively(bool p_enabled, bo
 	}
 }
 
-bool Control::has_focus() const {
+bool Control::has_focus(bool p_ignore_hidden_focus) const {
 	ERR_READ_THREAD_GUARD_V(false);
-	return is_inside_tree() && get_viewport()->_gui_control_has_focus(this);
+	return is_inside_tree() && get_viewport()->_gui_control_has_focus(this, p_ignore_hidden_focus);
 }
 
-void Control::grab_focus() {
+void Control::grab_focus(bool p_hide_focus) {
 	ERR_MAIN_THREAD_GUARD;
 	ERR_FAIL_COND(!is_inside_tree());
 
@@ -2329,7 +2329,7 @@ void Control::grab_focus() {
 		return;
 	}
 
-	get_viewport()->_gui_control_grab_focus(this);
+	get_viewport()->_gui_control_grab_focus(this, p_hide_focus);
 }
 
 void Control::grab_click_focus() {
@@ -4010,8 +4010,8 @@ void Control::_bind_methods() {
 	ClassDB::bind_method(D_METHOD("get_focus_mode_with_override"), &Control::get_focus_mode_with_override);
 	ClassDB::bind_method(D_METHOD("set_focus_behavior_recursive", "focus_behavior_recursive"), &Control::set_focus_behavior_recursive);
 	ClassDB::bind_method(D_METHOD("get_focus_behavior_recursive"), &Control::get_focus_behavior_recursive);
-	ClassDB::bind_method(D_METHOD("has_focus"), &Control::has_focus);
-	ClassDB::bind_method(D_METHOD("grab_focus"), &Control::grab_focus);
+	ClassDB::bind_method(D_METHOD("has_focus", "ignore_hidden_focus"), &Control::has_focus, DEFVAL(false));
+	ClassDB::bind_method(D_METHOD("grab_focus", "hide_focus"), &Control::grab_focus, DEFVAL(false));
 	ClassDB::bind_method(D_METHOD("release_focus"), &Control::release_focus);
 	ClassDB::bind_method(D_METHOD("find_prev_valid_focus"), &Control::find_prev_valid_focus);
 	ClassDB::bind_method(D_METHOD("find_next_valid_focus"), &Control::find_next_valid_focus);
diff --git a/scene/gui/control.h b/scene/gui/control.h
@@ -592,8 +592,8 @@ class Control : public CanvasItem {
 	FocusMode get_focus_mode_with_override() const;
 	void set_focus_behavior_recursive(FocusBehaviorRecursive p_focus_behavior_recursive);
 	FocusBehaviorRecursive get_focus_behavior_recursive() const;
-	bool has_focus() const;
-	void grab_focus();
+	bool has_focus(bool p_ignore_hidden_focus = false) const;
+	void grab_focus(bool p_hide_focus = false);
 	void grab_click_focus();
 	void release_focus();
 
diff --git a/scene/gui/foldable_container.cpp b/scene/gui/foldable_container.cpp
@@ -317,7 +317,7 @@ void FoldableContainer::_notification(int p_what) {
 				_draw_flippable_stylebox(theme_cache.panel_style, panel_rect);
 			}
 
-			if (has_focus()) {
+			if (has_focus(true)) {
 				Rect2 focus_rect = folded ? title_rect : Rect2(Point2(), size);
 				_draw_flippable_stylebox(theme_cache.focus_style, focus_rect);
 			}
diff --git a/scene/gui/graph_edit.cpp b/scene/gui/graph_edit.cpp
@@ -861,7 +861,7 @@ void GraphEdit::_notification(int p_what) {
 			// Draw background fill.
 			draw_style_box(theme_cache.panel, Rect2(Point2(), get_size()));
 
-			if (has_focus()) {
+			if (has_focus(true)) {
 				draw_style_box(theme_cache.panel_focus, Rect2(Point2(), get_size()));
 			}
 
diff --git a/scene/gui/item_list.cpp b/scene/gui/item_list.cpp
@@ -1383,7 +1383,7 @@ void ItemList::_notification(int p_what) {
 			Ref<StyleBox> sbsel;
 			Ref<StyleBox> cursor;
 
-			if (has_focus()) {
+			if (has_focus(true)) {
 				sbsel = theme_cache.selected_focus_style;
 				cursor = theme_cache.cursor_focus_style;
 			} else {
@@ -1507,7 +1507,7 @@ void ItemList::_notification(int p_what) {
 						draw_style_box(sbsel, r);
 					}
 					if (should_draw_hovered_selected_bg) {
-						if (has_focus()) {
+						if (has_focus(true)) {
 							draw_style_box(theme_cache.hovered_selected_focus_style, r);
 						} else {
 							draw_style_box(theme_cache.hovered_selected_style, r);
@@ -1695,7 +1695,7 @@ void ItemList::_notification(int p_what) {
 				draw_style_box(cursor, cursor_rcache);
 			}
 
-			if (has_focus()) {
+			if (has_focus(true)) {
 				RenderingServer::get_singleton()->canvas_item_add_clip_ignore(get_canvas_item(), true);
 				size.x -= (scroll_bar_h->get_max() - scroll_bar_h->get_page());
 				draw_style_box(theme_cache.focus_style, Rect2(Point2(), size));
diff --git a/scene/gui/label.cpp b/scene/gui/label.cpp
@@ -762,7 +762,7 @@ void Label::_notification(int p_what) {
 			Vector<LabelSettings::StackedShadowData> stacked_shadow_datas = has_settings ? settings->get_stacked_shadow_data() : Vector<LabelSettings::StackedShadowData>();
 			bool rtl_layout = is_layout_rtl();
 
-			if (has_focus()) {
+			if (has_focus(true)) {
 				theme_cache.focus_style->draw(ci, Rect2(Point2(0, 0), get_size()));
 			} else {
 				theme_cache.normal_style->draw(ci, Rect2(Point2(0, 0), get_size()));
diff --git a/scene/gui/line_edit.cpp b/scene/gui/line_edit.cpp
@@ -1337,7 +1337,7 @@ void LineEdit::_notification(int p_what) {
 				style->draw(ci, Rect2(Point2(), size));
 			}
 
-			if (has_focus()) {
+			if (has_focus(true)) {
 				theme_cache.focus->draw(ci, Rect2(Point2(), size));
 			}
 
diff --git a/scene/gui/link_button.cpp b/scene/gui/link_button.cpp
@@ -191,7 +191,7 @@ void LinkButton::_notification(int p_what) {
 
 			switch (get_draw_mode()) {
 				case DRAW_NORMAL: {
-					if (has_focus()) {
+					if (has_focus(true)) {
 						color = theme_cache.font_focus_color;
 					} else {
 						color = theme_cache.font_color;
@@ -222,7 +222,7 @@ void LinkButton::_notification(int p_what) {
 				} break;
 			}
 
-			if (has_focus()) {
+			if (has_focus(true)) {
 				Ref<StyleBox> style = theme_cache.focus;
 				style->draw(ci, Rect2(Point2(), size));
 			}
diff --git a/scene/gui/menu_bar.cpp b/scene/gui/menu_bar.cpp
@@ -493,7 +493,7 @@ void MenuBar::_draw_menu_item(int p_index) {
 			style->draw(ci, item_rect);
 		}
 		// Focus colors only take precedence over normal state.
-		if (has_focus()) {
+		if (has_focus(true)) {
 			color = theme_cache.font_focus_color;
 		} else {
 			color = theme_cache.font_color;
diff --git a/scene/gui/option_button.cpp b/scene/gui/option_button.cpp
@@ -114,7 +114,7 @@ void OptionButton::_notification(int p_what) {
 						clr = theme_cache.font_disabled_color;
 						break;
 					default:
-						if (has_focus()) {
+						if (has_focus(true)) {
 							clr = theme_cache.font_focus_color;
 						} else {
 							clr = theme_cache.font_color;
diff --git a/scene/gui/rich_text_label.cpp b/scene/gui/rich_text_label.cpp
@@ -2469,7 +2469,7 @@ void RichTextLabel::_notification(int p_what) {
 
 			draw_style_box(theme_cache.normal_style, Rect2(Point2(), size));
 
-			if (has_focus()) {
+			if (has_focus(true)) {
 				RenderingServer::get_singleton()->canvas_item_add_clip_ignore(ci, true);
 				draw_style_box(theme_cache.focus_style, Rect2(Point2(), size));
 				RenderingServer::get_singleton()->canvas_item_add_clip_ignore(ci, false);
diff --git a/scene/gui/scroll_bar.cpp b/scene/gui/scroll_bar.cpp
@@ -279,7 +279,7 @@ void ScrollBar::_notification(int p_what) {
 				area.height -= incr->get_height() + decr->get_height();
 			}
 
-			if (has_focus()) {
+			if (has_focus(true)) {
 				theme_cache.scroll_focus_style->draw(ci, Rect2(ofs, area));
 			} else {
 				theme_cache.scroll_style->draw(ci, Rect2(ofs, area));
diff --git a/scene/gui/scroll_container.cpp b/scene/gui/scroll_container.cpp
@@ -316,7 +316,7 @@ void ScrollContainer::_gui_focus_changed(Control *p_control) {
 		ensure_control_visible(p_control);
 	}
 	if (draw_focus_border) {
-		const bool _should_draw_focus_border = has_focus() || child_has_focus();
+		const bool _should_draw_focus_border = has_focus(true) || child_has_focus();
 		if (focus_border_is_drawn != _should_draw_focus_border) {
 			queue_redraw();
 		}
@@ -484,7 +484,7 @@ void ScrollContainer::_notification(int p_what) {
 
 		case NOTIFICATION_DRAW: {
 			draw_style_box(theme_cache.panel_style, Rect2(Vector2(), get_size()));
-			focus_border_is_drawn = draw_focus_border && (has_focus() || child_has_focus());
+			focus_border_is_drawn = draw_focus_border && (has_focus(true) || child_has_focus());
 			focus_panel->set_visible(focus_border_is_drawn);
 		} break;
 
@@ -815,7 +815,7 @@ bool ScrollContainer::get_draw_focus_border() {
 
 bool ScrollContainer::child_has_focus() {
 	const Control *focus_owner = get_viewport() ? get_viewport()->gui_get_focus_owner() : nullptr;
-	return focus_owner && is_ancestor_of(focus_owner);
+	return focus_owner && focus_owner->has_focus(true) && is_ancestor_of(focus_owner);
 }
 
 ScrollContainer::ScrollContainer() {
diff --git a/scene/gui/slider.cpp b/scene/gui/slider.cpp
@@ -56,7 +56,7 @@ void Slider::gui_input(const Ref<InputEvent> &p_event) {
 		if (mb->get_button_index() == MouseButton::LEFT) {
 			if (mb->is_pressed()) {
 				Ref<Texture2D> grabber;
-				if (mouse_inside || has_focus()) {
+				if (mouse_inside || has_focus(true)) {
 					grabber = theme_cache.grabber_hl_icon;
 				} else {
 					grabber = theme_cache.grabber_icon;
@@ -275,7 +275,7 @@ void Slider::_notification(int p_what) {
 			Ref<StyleBox> style = theme_cache.slider_style;
 			Ref<Texture2D> tick = theme_cache.tick_icon;
 
-			bool highlighted = editable && (mouse_inside || has_focus());
+			bool highlighted = editable && (mouse_inside || has_focus(true));
 			Ref<Texture2D> grabber;
 			if (editable) {
 				if (highlighted) {
diff --git a/scene/gui/tab_bar.cpp b/scene/gui/tab_bar.cpp
@@ -543,7 +543,7 @@ void TabBar::_notification(int p_what) {
 			if (current >= offset && current <= max_drawn_tab && !tabs[current].hidden) {
 				Ref<StyleBox> sb = tabs[current].disabled ? theme_cache.tab_disabled_style : theme_cache.tab_selected_style;
 
-				_draw_tab(sb, theme_cache.font_selected_color, current, rtl ? (size.width - tabs[current].ofs_cache - tabs[current].size_cache) : tabs[current].ofs_cache, has_focus());
+				_draw_tab(sb, theme_cache.font_selected_color, current, rtl ? (size.width - tabs[current].ofs_cache - tabs[current].size_cache) : tabs[current].ofs_cache, has_focus(true));
 			}
 
 			if (buttons_visible) {
diff --git a/scene/gui/text_edit.cpp b/scene/gui/text_edit.cpp
@@ -945,7 +945,7 @@ void TextEdit::_notification(int p_what) {
 				theme_cache.style_readonly->draw(ci, Rect2(Point2(), size));
 				draw_caret = is_drawing_caret_when_editable_disabled();
 			}
-			if (has_focus()) {
+			if (has_focus(true)) {
 				theme_cache.style_focus->draw(ci, Rect2(Point2(), size));
 			}
 
diff --git a/scene/gui/texture_button.cpp b/scene/gui/texture_button.cpp
@@ -168,7 +168,7 @@ void TextureButton::_notification(int p_what) {
 
 			Point2 ofs;
 			Size2 size;
-			bool draw_focus = (has_focus() && focused.is_valid());
+			bool draw_focus = (has_focus(true) && focused.is_valid());
 
 			// If no other texture is valid, try using focused texture.
 			bool draw_focus_only = draw_focus && texdraw.is_null();
diff --git a/scene/gui/tree.cpp b/scene/gui/tree.cpp
@@ -2324,13 +2324,13 @@ int Tree::draw_item(const Point2i &p_pos, const Point2 &p_draw_ofs, const Size2
 
 					if (p_item->cells[0].selected) {
 						if (is_row_hovered) {
-							if (has_focus()) {
+							if (has_focus(true)) {
 								theme_cache.hovered_selected_focus->draw(ci, row_rect);
 							} else {
 								theme_cache.hovered_selected->draw(ci, row_rect);
 							}
 						} else {
-							if (has_focus()) {
+							if (has_focus(true)) {
 								theme_cache.selected_focus->draw(ci, row_rect);
 							} else {
 								theme_cache.selected->draw(ci, row_rect);
@@ -2372,13 +2372,13 @@ int Tree::draw_item(const Point2i &p_pos, const Point2 &p_draw_ofs, const Size2
 					}
 					if (p_item->cells[i].selected) {
 						if (is_cell_hovered) {
-							if (has_focus()) {
+							if (has_focus(true)) {
 								theme_cache.hovered_selected_focus->draw(ci, r);
 							} else {
 								theme_cache.hovered_selected->draw(ci, r);
 							}
 						} else {
-							if (has_focus()) {
+							if (has_focus(true)) {
 								theme_cache.selected_focus->draw(ci, r);
 							} else {
 								theme_cache.selected->draw(ci, r);
@@ -2672,7 +2672,7 @@ int Tree::draw_item(const Point2i &p_pos, const Point2 &p_draw_ofs, const Size2
 				if (is_layout_rtl()) {
 					cell_rect.position.x = get_size().width - cell_rect.position.x - cell_rect.size.x;
 				}
-				if (has_focus()) {
+				if (has_focus(true)) {
 					theme_cache.cursor->draw(ci, cell_rect);
 				} else {
 					theme_cache.cursor_unfocus->draw(ci, cell_rect);
@@ -5078,7 +5078,7 @@ void Tree::_notification(int p_what) {
 
 			// Draw the focus outline last, so that it is drawn in front of the section headings.
 			// Otherwise, section heading backgrounds can appear to be in front of the focus outline when scrolling.
-			if (has_focus()) {
+			if (has_focus(true)) {
 				RenderingServer::get_singleton()->canvas_item_add_clip_ignore(ci, true);
 				theme_cache.focus_style->draw(ci, Rect2(Point2(), get_size()));
 				RenderingServer::get_singleton()->canvas_item_add_clip_ignore(ci, false);
diff --git a/scene/main/viewport.cpp b/scene/main/viewport.cpp
diff --git a/scene/main/viewport.h b/scene/main/viewport.h

Original file line number	Diff line number	Diff line change
`@@ -340,7 +340,7 @@ void EditorSpinSlider::_draw_spin_slider() {`
`340`	`340`	`}`
`341`	`341`	`}`
`342`	`342`
`343`		`- if (has_focus()) {`
	`343`	`+ if (has_focus(true)) {`
`344`	`344`	`Ref<StyleBox> focus = get_theme_stylebox(SNAME("focus"), SNAME("LineEdit"));`
`345`	`345`	`draw_style_box(focus, Rect2(Vector2(), size));`
`346`	`346`	`}`
Original file line number	Diff line number	Diff line change
`@@ -2797,7 +2797,7 @@ void CanvasItemEditor::_gui_input_viewport(const Ref<InputEvent> &p_event) {`
`2797`	`2797`
`2798`	`2798`	`// Grab focus`
`2799`	`2799`	`if (!viewport->has_focus() && (!get_viewport()->gui_get_focus_owner() \|\| !get_viewport()->gui_get_focus_owner()->is_text_field())) {`
`2800`		`- callable_mp((Control *)viewport, &Control::grab_focus).call_deferred();`
	`2800`	`+ callable_mp((Control *)viewport, &Control::grab_focus).call_deferred(false);`
`2801`	`2801`	`}`
`2802`	`2802`	`}`
`2803`	`2803`
Original file line number	Diff line number	Diff line change
`@@ -1491,7 +1491,7 @@ void ColorPicker::_sample_draw() {`
`1491`	`1491`
`1492`	`1492`	`sample->draw_rect(rect_new, color);`
`1493`	`1493`
`1494`		`- if (display_old_color && !old_color.is_equal_approx(color) && sample->has_focus()) {`
	`1494`	`+ if (display_old_color && !old_color.is_equal_approx(color) && sample->has_focus(true)) {`
`1495`	`1495`	`RID ci = sample->get_canvas_item();`
`1496`	`1496`	`theme_cache.sample_focus->draw(ci, rect_old);`
`1497`	`1497`	`}`
`@@ -2663,7 +2663,7 @@ void ColorPresetButton::_notification(int p_what) {`
`2663`	`2663`	`WARN_PRINT("Unsupported StyleBox used for ColorPresetButton. Use StyleBoxFlat or StyleBoxTexture instead.");`
`2664`	`2664`	`}`
`2665`	`2665`
`2666`		`- if (has_focus()) {`
	`2666`	`+ if (has_focus(true)) {`
`2667`	`2667`	`RID ci = get_canvas_item();`
`2668`	`2668`	`theme_cache.focus_style->draw(ci, Rect2(Point2(), get_size()));`
`2669`	`2669`	`}`
Original file line number	Diff line number	Diff line change
`@@ -84,7 +84,7 @@ void ColorPickerShape::cancel_event() {`
`84`	`84`	`}`
`85`	`85`
`86`	`86`	`void ColorPickerShape::draw_focus_rect(Control *p_control, const Rect2 &p_rect) {`
`87`		`- if (!p_control->has_focus()) {`
	`87`	`+ if (!p_control->has_focus(true)) {`
`88`	`88`	`return;`
`89`	`89`	`}`
`90`	`90`
`@@ -103,7 +103,7 @@ void ColorPickerShape::draw_focus_rect(Control *p_control, const Rect2 &p_rect)`
`103`	`103`	`}`
`104`	`104`
`105`	`105`	`void ColorPickerShape::draw_focus_circle(Control *p_control) {`
`106`		`- if (!p_control->has_focus()) {`
	`106`	`+ if (!p_control->has_focus(true)) {`
`107`	`107`	`return;`
`108`	`108`	`}`
`109`	`109`
Original file line number	Diff line number	Diff line change
`@@ -2315,12 +2315,12 @@ void Control::_propagate_focus_behavior_recursive_recursively(bool p_enabled, bo`
`2315`	`2315`	`}`
`2316`	`2316`	`}`
`2317`	`2317`
`2318`		`-bool Control::has_focus() const {`
	`2318`	`+bool Control::has_focus(bool p_ignore_hidden_focus) const {`
`2319`	`2319`	`ERR_READ_THREAD_GUARD_V(false);`
`2320`		`- return is_inside_tree() && get_viewport()->_gui_control_has_focus(this);`
	`2320`	`+ return is_inside_tree() && get_viewport()->_gui_control_has_focus(this, p_ignore_hidden_focus);`
`2321`	`2321`	`}`
`2322`	`2322`
`2323`		`-void Control::grab_focus() {`
	`2323`	`+void Control::grab_focus(bool p_hide_focus) {`
`2324`	`2324`	`ERR_MAIN_THREAD_GUARD;`
`2325`	`2325`	`ERR_FAIL_COND(!is_inside_tree());`
`2326`	`2326`
`@@ -2329,7 +2329,7 @@ void Control::grab_focus() {`
`2329`	`2329`	`return;`
`2330`	`2330`	`}`
`2331`	`2331`
`2332`		`- get_viewport()->_gui_control_grab_focus(this);`
	`2332`	`+ get_viewport()->_gui_control_grab_focus(this, p_hide_focus);`
`2333`	`2333`	`}`
`2334`	`2334`
`2335`	`2335`	`void Control::grab_click_focus() {`
`@@ -4010,8 +4010,8 @@ void Control::_bind_methods() {`
`4010`	`4010`	`ClassDB::bind_method(D_METHOD("get_focus_mode_with_override"), &Control::get_focus_mode_with_override);`
`4011`	`4011`	`ClassDB::bind_method(D_METHOD("set_focus_behavior_recursive", "focus_behavior_recursive"), &Control::set_focus_behavior_recursive);`
`4012`	`4012`	`ClassDB::bind_method(D_METHOD("get_focus_behavior_recursive"), &Control::get_focus_behavior_recursive);`
`4013`		`- ClassDB::bind_method(D_METHOD("has_focus"), &Control::has_focus);`
`4014`		`- ClassDB::bind_method(D_METHOD("grab_focus"), &Control::grab_focus);`
	`4013`	`+ ClassDB::bind_method(D_METHOD("has_focus", "ignore_hidden_focus"), &Control::has_focus, DEFVAL(false));`
	`4014`	`+ ClassDB::bind_method(D_METHOD("grab_focus", "hide_focus"), &Control::grab_focus, DEFVAL(false));`
`4015`	`4015`	`ClassDB::bind_method(D_METHOD("release_focus"), &Control::release_focus);`
`4016`	`4016`	`ClassDB::bind_method(D_METHOD("find_prev_valid_focus"), &Control::find_prev_valid_focus);`
`4017`	`4017`	`ClassDB::bind_method(D_METHOD("find_next_valid_focus"), &Control::find_next_valid_focus);`
Original file line number	Diff line number	Diff line change
`@@ -317,7 +317,7 @@ void FoldableContainer::_notification(int p_what) {`
`317`	`317`	`_draw_flippable_stylebox(theme_cache.panel_style, panel_rect);`
`318`	`318`	`}`
`319`	`319`
`320`		`- if (has_focus()) {`
	`320`	`+ if (has_focus(true)) {`
`321`	`321`	`Rect2 focus_rect = folded ? title_rect : Rect2(Point2(), size);`
`322`	`322`	`_draw_flippable_stylebox(theme_cache.focus_style, focus_rect);`
`323`	`323`	`}`
Original file line number	Diff line number	Diff line change
`@@ -861,7 +861,7 @@ void GraphEdit::_notification(int p_what) {`
`861`	`861`	`// Draw background fill.`
`862`	`862`	`draw_style_box(theme_cache.panel, Rect2(Point2(), get_size()));`
`863`	`863`
`864`		`- if (has_focus()) {`
	`864`	`+ if (has_focus(true)) {`
`865`	`865`	`draw_style_box(theme_cache.panel_focus, Rect2(Point2(), get_size()));`
`866`	`866`	`}`
`867`	`867`