Stowage/godot
2
0
Fork 0
mirror of https://github.com/godotengine/godot.git synced 2025-12-07 13:49:54 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #112895 from YeldhamDev/project_list_focus_fix

Browse source 
Hide mouse focus from project list
This commit is contained in:
Thaddeus Crews 2025-12-02 11:52:14 -06:00
commit 25203e24c4
No known key found for this signature in database
GPG key ID: 8C6E5FEB5FC03CCC
2 changed files with 14 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

18
editor/project_manager/project_list.cpp
View file

@ -142,7 +142,8 @@ void ProjectListItemControl::_notification(int p_what) {
if (is_hovering) { if (is_hovering) {
draw_style_box(get_theme_stylebox(SNAME("hovered"), SNAME("Tree")), Rect2(Point2(), get_size())); draw_style_box(get_theme_stylebox(SNAME("hovered"), SNAME("Tree")), Rect2(Point2(), get_size()));
} }
if (has_focus()) { // Due to how this control works, we can't rely on the built-in way of checking for focus visibility.
if (has_focus() && !is_focus_hidden) {
draw_style_box(get_theme_stylebox(SNAME("focus"), SNAME("Tree")), Rect2(Point2(), get_size())); draw_style_box(get_theme_stylebox(SNAME("focus"), SNAME("Tree")), Rect2(Point2(), get_size()));
} }
@ -296,8 +297,9 @@ bool ProjectListItemControl::should_load_project_icon() const {
return icon_needs_reload; return icon_needs_reload;
} }
void ProjectListItemControl::set_selected(bool p_selected) { void ProjectListItemControl::set_selected(bool p_selected, bool p_hide_focus) {
is_selected = p_selected; is_selected = p_selected;
is_focus_hidden = is_selected && p_hide_focus;
queue_redraw(); queue_redraw();
queue_accessibility_update(); queue_accessibility_update();
} }
@ -1017,7 +1019,7 @@ int ProjectList::get_index(const ProjectListItemControl *p_control) const {
void ProjectList::ensure_project_visible(int p_index) { void ProjectList::ensure_project_visible(int p_index) {
const Item &item = _projects[p_index]; const Item &item = _projects[p_index];
// Since follow focus is enabled. // Since follow focus is enabled.
item.control->grab_focus(); item.control->grab_focus(true);
} }
void ProjectList::_create_project_item_control(int p_index) { void ProjectList::_create_project_item_control(int p_index) {
@ -1111,7 +1113,7 @@ void ProjectList::_list_item_input(const Ref<InputEvent> &p_ev, Control *p_hb) {
} else { } else {
_last_clicked = clicked_project.path; _last_clicked = clicked_project.path;
select_project(clicked_index); select_project(clicked_index, true);
} }
emit_signal(SNAME(SIGNAL_SELECTION_CHANGED)); emit_signal(SNAME(SIGNAL_SELECTION_CHANGED));
@ -1255,10 +1257,10 @@ void ProjectList::_clear_project_selection() {
queue_accessibility_update(); queue_accessibility_update();
} }
void ProjectList::_select_project_nocheck(int p_index) { void ProjectList::_select_project_nocheck(int p_index, bool p_hide_focus) {
Item &item = _projects.write[p_index]; Item &item = _projects.write[p_index];
_selected_project_paths.insert(item.path); _selected_project_paths.insert(item.path);
item.control->set_selected(true); item.control->set_selected(true, p_hide_focus);
queue_accessibility_update(); queue_accessibility_update();
} }
@ -1286,10 +1288,10 @@ void ProjectList::_select_project_range(int p_begin, int p_end) {
} }
} }
void ProjectList::select_project(int p_index) { void ProjectList::select_project(int p_index, bool p_hide_focus) {
// This method keeps only one project selected. // This method keeps only one project selected.
_clear_project_selection(); _clear_project_selection();
_select_project_nocheck(p_index); _select_project_nocheck(p_index, p_hide_focus);
} }
void ProjectList::deselect_project(int p_index) { void ProjectList::deselect_project(int p_index) {

7
editor/project_manager/project_list.h
View file

@ -64,6 +64,7 @@ class ProjectListItemControl : public HBoxContainer {
bool project_is_missing = false; bool project_is_missing = false;
bool icon_needs_reload = true; bool icon_needs_reload = true;
bool is_selected = false; bool is_selected = false;
bool is_focus_hidden = false;
bool is_hovering = false; bool is_hovering = false;
bool is_favorite = false; bool is_favorite = false;
@ -93,7 +94,7 @@ public:
void set_unsupported_features(PackedStringArray p_features); void set_unsupported_features(PackedStringArray p_features);
bool should_load_project_icon() const; bool should_load_project_icon() const;
void set_selected(bool p_selected); void set_selected(bool p_selected, bool p_hide_focus = false);
void set_is_favorite(bool p_favorite); void set_is_favorite(bool p_favorite);
void set_is_missing(bool p_missing); void set_is_missing(bool p_missing);
@ -261,7 +262,7 @@ private:
// Project list selection. // Project list selection.
void _clear_project_selection(); void _clear_project_selection();
void _select_project_nocheck(int p_index); void _select_project_nocheck(int p_index, bool p_hide_focus = false);
void _deselect_project_nocheck(int p_index); void _deselect_project_nocheck(int p_index);
void _select_project_range(int p_begin, int p_end); void _select_project_range(int p_begin, int p_end);
@ -306,7 +307,7 @@ public:
// Project list selection. // Project list selection.
void select_project(int p_index); void select_project(int p_index, bool p_hide_focus = false);
void deselect_project(int p_index); void deselect_project(int p_index);
void select_first_visible_project(); void select_first_visible_project();
void select_all_visible_projects(); void select_all_visible_projects();