asgardius/virtualx-engine
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #61212 from Calinou/project-manager-filter-order-swap-3.x

Browse source
This commit is contained in:
Rémi Verschelde 2022-05-24 00:18:06 +02:00 committed by GitHub
commit 573706bd24
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 15 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

29
editor/project_manager.cpp
View file

@ -2468,12 +2468,12 @@ ProjectManager::ProjectManager() {
search_tree_vb->set_h_size_flags(SIZE_EXPAND_FILL); search_tree_vb->set_h_size_flags(SIZE_EXPAND_FILL);
HBoxContainer *sort_filters = memnew(HBoxContainer); HBoxContainer *sort_filters = memnew(HBoxContainer);
loading_label = memnew(Label(TTR("Loading, please wait...")));
loading_label->add_font_override("font", get_font("bold", "EditorFonts")); project_filter = memnew(ProjectListFilter);
loading_label->set_h_size_flags(Control::SIZE_EXPAND_FILL); project_filter->add_search_box();
sort_filters->add_child(loading_label); project_filter->connect("filter_changed", this, "_on_filter_option_changed");
// The loading label is shown later. project_filter->set_h_size_flags(SIZE_EXPAND_FILL);
loading_label->hide(); sort_filters->add_child(project_filter);
Label *sort_label = memnew(Label); Label *sort_label = memnew(Label);
sort_label->set_text(TTR("Sort:")); sort_label->set_text(TTR("Sort:"));
@ -2488,18 +2488,19 @@ ProjectManager::ProjectManager() {
project_order_filter->set_filter_size(150); project_order_filter->set_filter_size(150);
sort_filters->add_child(project_order_filter); sort_filters->add_child(project_order_filter);
project_order_filter->connect("filter_changed", this, "_on_order_option_changed"); project_order_filter->connect("filter_changed", this, "_on_order_option_changed");
project_order_filter->set_custom_minimum_size(Size2(180, 10) * EDSCALE);
int projects_sorting_order = (int)EditorSettings::get_singleton()->get("project_manager/sorting_order"); const int projects_sorting_order = (int)EditorSettings::get_singleton()->get("project_manager/sorting_order");
project_order_filter->set_filter_option((ProjectListFilter::FilterOption)projects_sorting_order); project_order_filter->set_filter_option((ProjectListFilter::FilterOption)projects_sorting_order);
project_filter = memnew(ProjectListFilter);
project_filter->add_search_box();
project_filter->connect("filter_changed", this, "_on_filter_option_changed");
project_filter->set_h_size_flags(SIZE_EXPAND_FILL);
sort_filters->add_child(project_filter);
search_tree_vb->add_child(sort_filters); search_tree_vb->add_child(sort_filters);
loading_label = memnew(Label(TTR("Loading, please wait...")));
loading_label->add_font_override("font", get_font("bold", "EditorFonts"));
loading_label->set_h_size_flags(Control::SIZE_EXPAND_FILL);
sort_filters->add_child(loading_label);
// The loading label is shown later.
loading_label->hide();
PanelContainer *pc = memnew(PanelContainer); PanelContainer *pc = memnew(PanelContainer);
pc->add_style_override("panel", gui_base->get_stylebox("bg", "Tree")); pc->add_style_override("panel", gui_base->get_stylebox("bg", "Tree"));
search_tree_vb->add_child(pc); search_tree_vb->add_child(pc);