0ct0pu5/wesnoth
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Campaign filtering begone!

Browse source
This commit is contained in:
Charles Dang 2019-11-04 04:27:47 +11:00
parent 1fae8c238d
commit c7f2d7a22b
3 changed files with 4 additions and 70 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
data/gui/window/campaign_dialog.cfg
View file

@ -195,23 +195,6 @@
[grid]
[row]
grow_factor = 0
[column]
grow_factor = 1
border = "all"
border_size = 5
horizontal_grow = true
[text_box]
id = "filter_box"
definition = "default"
{FILTER_TEXT_BOX_HINT}
[/text_box]
[/column]
[/row]
[row]
grow_factor = 1

52
src/gui/dialogs/campaign_selection.cpp
View file

@ -24,7 +24,6 @@
#include "gui/widgets/multimenu_button.hpp"
#include "gui/widgets/scroll_label.hpp"
#include "gui/widgets/settings.hpp"
#include "gui/widgets/text_box.hpp"
#include "gui/widgets/toggle_button.hpp"
#include "gui/widgets/tree_view.hpp"
#include "gui/widgets/tree_view_node.hpp"
@ -156,36 +155,11 @@ void campaign_selection::sort_campaigns(window& window, campaign_selection::CAMP
tree.clear();
}
boost::dynamic_bitset<> show_items;
show_items.resize(levels.size(), true);
if(!last_search_words_.empty()) {
for(unsigned i = 0; i < levels.size(); ++i) {
bool found = false;
for(const auto& word : last_search_words_) {
found = translation::ci_search(levels[i]->name(), word);
if(!found) {
break;
}
}
show_items[i] = found;
}
for(const auto& campaign : levels) {
add_campaign_to_tree(window, campaign->data());
}
bool exists_in_filtered_result = false;
for(unsigned i = 0; i < levels.size(); ++i) {
if(show_items[i]) {
add_campaign_to_tree(window, levels[i]->data());
if (!exists_in_filtered_result) {
exists_in_filtered_result = levels[i]->id() == was_selected;
}
}
}
if(!was_selected.empty() && exists_in_filtered_result) {
if(!was_selected.empty()) {
find_widget<tree_view_node>(&window, was_selected, false).select_node();
} else {
campaign_selected(window);
@ -227,25 +201,8 @@ void campaign_selection::toggle_sorting_selection(window& window, CAMPAIGN_ORDER
sort_campaigns(window, current_sorting_, currently_sorted_asc_);
}
void campaign_selection::filter_text_changed(text_box_base* textbox, const std::string& text)
{
const std::vector<std::string> words = utils::split(text, ' ');
if(words == last_search_words_) {
return;
}
last_search_words_ = words;
window& window = *textbox->get_window();
sort_campaigns(window, current_sorting_, currently_sorted_asc_);
}
void campaign_selection::pre_show(window& window)
{
text_box* filter = find_widget<text_box>(&window, "filter_box", false, true);
filter->set_text_changed_callback(
std::bind(&campaign_selection::filter_text_changed, this, _1, _2));
/***** Setup campaign tree. *****/
tree_view& tree = find_widget<tree_view>(&window, "campaign_tree", false);
@ -261,8 +218,7 @@ void campaign_selection::pre_show(window& window)
connect_signal_notify_modified(sort_time,
std::bind(&campaign_selection::toggle_sorting_selection, this, std::ref(window), DATE));
window.keyboard_capture(filter);
window.add_to_keyboard_chain(&tree);
window.keyboard_capture(&tree);
/***** Setup campaign details. *****/
multi_page& pages = find_widget<multi_page>(&window, "campaign_details", false);

5
src/gui/dialogs/campaign_selection.hpp
View file

@ -15,7 +15,6 @@
#pragma once
#include "gui/dialogs/modal_dialog.hpp"
#include "gui/widgets/text_box_base.hpp"
#include "game_initialization/create_engine.hpp"
@ -75,8 +74,6 @@ private:
void mod_toggled(window& window);
void filter_text_changed(text_box_base* textbox, const std::string &text);
ng::create_engine& engine_;
/** The chosen campaign. */
@ -92,8 +89,6 @@ private:
CAMPAIGN_ORDER current_sorting_;
bool currently_sorted_asc_;
std::vector<std::string> last_search_words_;
};
} // namespace dialogs