Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Avoid duplicate filters and update icon on theme change #79657

Closed
wants to merge 2 commits into from
Closed

Avoid duplicate filters and update icon on theme change #79657

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
40f77a1
Avoid duplicating the 'Filters' section
garychia Jul 19, 2023
b64a1a6
Update filter menu search icon on theme change
jonhermansen Jul 19, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 8 additions & 1 deletion editor/scene_tree_dock.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1385,6 +1385,11 @@ void SceneTreeDock::_notification(int p_what) {
button_tree_menu->set_icon(get_theme_icon(SNAME("GuiTabMenuHl"), SNAME("EditorIcons")));

filter->set_right_icon(get_theme_icon(SNAME("Search"), SNAME("EditorIcons")));
// Also remember to update the theme icon in filter menu, if menu was ever opened
int filter_menu_search_icon_idx = filter->get_menu()->get_item_idx_from_text(TTR("Filters"));
if (filter_menu_search_icon_idx != -1) {
filter->get_menu()->set_item_icon(filter_menu_search_icon_idx, get_theme_icon(SNAME("Search"), SNAME("EditorIcons")));
}

// These buttons are created on READY, because reasons...
if (button_2d) {
Expand Down Expand Up @@ -3031,7 +3036,9 @@ void SceneTreeDock::_update_tree_menu() {
}

void SceneTreeDock::_update_filter_menu() {
_append_filter_options_to(filter->get_menu());
if (filter->get_menu()->get_item_idx_from_text(TTR("Filters")) == -1) {
_append_filter_options_to(filter->get_menu());
}
}

void SceneTreeDock::_filter_changed(const String &p_filter) {
Expand Down