Stowage/godot
2
0
Fork 0
mirror of https://github.com/godotengine/godot.git synced 2025-10-31 13:41:03 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #95902 from kitbdev/remove-forced-mouse-focus

Browse source 
Clean up Viewport's `forced_mouse_focus`
This commit is contained in:
Rémi Verschelde 2024-09-03 17:38:17 +02:00
commit e2dd56bea7
No known key found for this signature in database
GPG key ID: C3336907360768E1
5 changed files with 5 additions and 38 deletions
Download patch file Download diff file Expand all files Collapse all files

1
editor/gui/editor_object_selector.cpp
View file

@ -103,7 +103,6 @@ void EditorObjectSelector::_show_popup() {
sub_objects_menu->set_position(gp); sub_objects_menu->set_position(gp);
sub_objects_menu->set_size(Size2(size.width, 1)); sub_objects_menu->set_size(Size2(size.width, 1));
sub_objects_menu->take_mouse_focus();
sub_objects_menu->popup(); sub_objects_menu->popup();
} }

8
scene/gui/popup_menu.cpp
View file

@ -2592,14 +2592,6 @@ void PopupMenu::clear_autohide_areas() {
autohide_areas.clear(); autohide_areas.clear();
} }
void PopupMenu::take_mouse_focus() {
ERR_FAIL_COND(!is_inside_tree());
if (get_parent()) {
get_parent()->get_viewport()->pass_mouse_focus_to(this, control);
}
}
bool PopupMenu::_set(const StringName &p_name, const Variant &p_value) { bool PopupMenu::_set(const StringName &p_name, const Variant &p_value) {
if (property_helper.property_set_value(p_name, p_value)) { if (property_helper.property_set_value(p_name, p_value)) {
return true; return true;

2
scene/gui/popup_menu.h
View file

@ -369,8 +369,6 @@ public:
virtual void popup(const Rect2i &p_bounds = Rect2i()) override; virtual void popup(const Rect2i &p_bounds = Rect2i()) override;
virtual void set_visible(bool p_visible) override; virtual void set_visible(bool p_visible) override;
void take_mouse_focus();
PopupMenu(); PopupMenu();
~PopupMenu(); ~PopupMenu();
}; };

27
scene/main/viewport.cpp
View file

@ -655,9 +655,7 @@ void Viewport::_notification(int p_what) {
case NOTIFICATION_WM_WINDOW_FOCUS_OUT: { case NOTIFICATION_WM_WINDOW_FOCUS_OUT: {
_gui_cancel_tooltip(); _gui_cancel_tooltip();
_drop_physics_mouseover(); _drop_physics_mouseover();
if (gui.mouse_focus && !gui.forced_mouse_focus) {
_drop_mouse_focus(); _drop_mouse_focus();
}
// When the window focus changes, we want to end mouse_focus, but // When the window focus changes, we want to end mouse_focus, but
// not the mouse_over. Note: The OS will trigger a separate mouse // not the mouse_over. Note: The OS will trigger a separate mouse
// exit event if the change in focus results in the mouse exiting // exit event if the change in focus results in the mouse exiting
@ -1835,7 +1833,6 @@ void Viewport::_gui_input_event(Ref<InputEvent> p_event) {
// as the release will never be received otherwise. // as the release will never be received otherwise.
if (gui.mouse_focus_mask.is_empty()) { if (gui.mouse_focus_mask.is_empty()) {
gui.mouse_focus = nullptr; gui.mouse_focus = nullptr;
gui.forced_mouse_focus = false;
} }
bool stopped = mouse_focus && mouse_focus->can_process() && _gui_call_input(mouse_focus, mb); bool stopped = mouse_focus && mouse_focus->can_process() && _gui_call_input(mouse_focus, mb);
@ -1864,7 +1861,6 @@ void Viewport::_gui_input_event(Ref<InputEvent> p_event) {
gui.drag_data = control->get_drag_data(control->get_global_transform_with_canvas().affine_inverse().xform(mpos - gui.drag_accum)); gui.drag_data = control->get_drag_data(control->get_global_transform_with_canvas().affine_inverse().xform(mpos - gui.drag_accum));
if (gui.drag_data.get_type() != Variant::NIL) { if (gui.drag_data.get_type() != Variant::NIL) {
gui.mouse_focus = nullptr; gui.mouse_focus = nullptr;
gui.forced_mouse_focus = false;
gui.mouse_focus_mask.clear(); gui.mouse_focus_mask.clear();
break; break;
} else { } else {
@ -2407,7 +2403,6 @@ void Viewport::_gui_hide_control(Control *p_control) {
void Viewport::_gui_remove_control(Control *p_control) { void Viewport::_gui_remove_control(Control *p_control) {
if (gui.mouse_focus == p_control) { if (gui.mouse_focus == p_control) {
gui.mouse_focus = nullptr; gui.mouse_focus = nullptr;
gui.forced_mouse_focus = false;
gui.mouse_focus_mask.clear(); gui.mouse_focus_mask.clear();
} }
if (gui.key_focus == p_control) { if (gui.key_focus == p_control) {
@ -2573,9 +2568,12 @@ void Viewport::_drop_mouse_focus() {
Control *c = gui.mouse_focus; Control *c = gui.mouse_focus;
BitField<MouseButtonMask> mask = gui.mouse_focus_mask; BitField<MouseButtonMask> mask = gui.mouse_focus_mask;
gui.mouse_focus = nullptr; gui.mouse_focus = nullptr;
gui.forced_mouse_focus = false;
gui.mouse_focus_mask.clear(); gui.mouse_focus_mask.clear();
if (!c) {
return;
}
for (int i = 0; i < 3; i++) { for (int i = 0; i < 3; i++) {
if ((int)mask & (1 << i)) { if ((int)mask & (1 << i)) {
Ref<InputEventMouseButton> mb; Ref<InputEventMouseButton> mb;
@ -3902,23 +3900,6 @@ Rect2i Viewport::subwindow_get_popup_safe_rect(Window *p_window) const {
return gui.sub_windows[index].parent_safe_rect; return gui.sub_windows[index].parent_safe_rect;
} }
void Viewport::pass_mouse_focus_to(Viewport *p_viewport, Control *p_control) {
ERR_MAIN_THREAD_GUARD;
ERR_FAIL_NULL(p_viewport);
ERR_FAIL_NULL(p_control);
if (gui.mouse_focus) {
p_viewport->gui.mouse_focus = p_control;
p_viewport->gui.mouse_focus_mask = gui.mouse_focus_mask;
p_viewport->gui.key_focus = p_control;
p_viewport->gui.forced_mouse_focus = true;
gui.mouse_focus = nullptr;
gui.forced_mouse_focus = false;
gui.mouse_focus_mask.clear();
}
}
void Viewport::set_sdf_oversize(SDFOversize p_sdf_oversize) { void Viewport::set_sdf_oversize(SDFOversize p_sdf_oversize) {
ERR_MAIN_THREAD_GUARD; ERR_MAIN_THREAD_GUARD;
ERR_FAIL_INDEX(p_sdf_oversize, SDF_OVERSIZE_MAX); ERR_FAIL_INDEX(p_sdf_oversize, SDF_OVERSIZE_MAX);

3
scene/main/viewport.h
View file

@ -349,7 +349,6 @@ private:
Ref<Texture2D> vrs_texture; Ref<Texture2D> vrs_texture;
struct GUI { struct GUI {
bool forced_mouse_focus = false; //used for menu buttons
bool mouse_in_viewport = false; bool mouse_in_viewport = false;
bool key_event_accepted = false; bool key_event_accepted = false;
HashMap<int, ObjectID> touch_focus; HashMap<int, ObjectID> touch_focus;
@ -662,8 +661,6 @@ public:
Viewport *get_parent_viewport() const; Viewport *get_parent_viewport() const;
Window *get_base_window() const; Window *get_base_window() const;
void pass_mouse_focus_to(Viewport *p_viewport, Control *p_control);
void set_canvas_cull_mask(uint32_t p_layers); void set_canvas_cull_mask(uint32_t p_layers);
uint32_t get_canvas_cull_mask() const; uint32_t get_canvas_cull_mask() const;