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

fix: monsters search #115

Merged
merged 2 commits into from
Aug 27, 2024
Merged

fix: monsters search #115

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a949e10
fix: monsters search
phacUFPE Aug 27, 2024
188e37a
Merge branch 'main' into fix_monsters_search
majestyotbr Aug 27, 2024
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
53 changes: 46 additions & 7 deletions source/palette_monster.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,8 +38,6 @@ EVT_TOGGLEBUTTON(PALETTE_SPAWN_MONSTER_BRUSH_BUTTON, MonsterPalettePanel::OnClic

EVT_SPINCTRL(PALETTE_MONSTER_SPAWN_TIME, MonsterPalettePanel::OnChangeSpawnMonsterTime)
EVT_SPINCTRL(PALETTE_MONSTER_SPAWN_SIZE, MonsterPalettePanel::OnChangeSpawnMonsterSize)

EVT_TEXT_ENTER(PALETTE_MONSTER_SEARCH, MonsterPalettePanel::OnChangeMonsterName)
END_EVENT_TABLE()

MonsterPalettePanel::MonsterPalettePanel(wxWindow* parent, wxWindowID id) :
Expand All @@ -52,8 +50,18 @@ MonsterPalettePanel::MonsterPalettePanel(wxWindow* parent, wxWindowID id) :
tileset_choice = newd wxChoice(this, PALETTE_MONSTER_TILESET_CHOICE, wxDefaultPosition, wxDefaultSize, (int)0, (const wxString*)nullptr);
sidesizer->Add(tileset_choice, 0, wxEXPAND);

monster_name_text = newd wxTextCtrl(this, PALETTE_MONSTER_SEARCH, "Name");
sidesizer->Add(monster_name_text, 0, wxEXPAND);
wxSizer* monsterNameSizer = newd wxStaticBoxSizer(wxHORIZONTAL, this);
monster_name_text = newd wxTextCtrl(this, PALETTE_MONSTER_SEARCH, "Search name", wxDefaultPosition, wxDefaultSize, wxTE_PROCESS_ENTER);
monster_name_text->Bind(wxEVT_SET_FOCUS, &MonsterPalettePanel::OnSetFocus, this);
monster_name_text->Bind(wxEVT_KILL_FOCUS, &MonsterPalettePanel::OnKillFocus, this);
monster_name_text->Bind(wxEVT_TEXT_ENTER, &MonsterPalettePanel::OnChangeMonsterNameSearch, this);

monster_search_button = newd wxButton(this, wxID_ANY, "Search");
monster_search_button->Bind(wxEVT_BUTTON, &MonsterPalettePanel::OnChangeMonsterNameSearch, this);

monsterNameSizer->Add(monster_name_text, 2, wxEXPAND);
monsterNameSizer->Add(monster_search_button, 1, wxEXPAND);
sidesizer->Add(monsterNameSizer);

monster_list = newd SortableListBox(this, PALETTE_MONSTER_LISTBOX);
sidesizer->Add(monster_list, 1, wxEXPAND);
Expand Down Expand Up @@ -90,7 +98,9 @@ MonsterPalettePanel::MonsterPalettePanel(wxWindow* parent, wxWindowID id) :
}

MonsterPalettePanel::~MonsterPalettePanel() {
////
monster_name_text->Unbind(wxEVT_SET_FOCUS, &MonsterPalettePanel::OnSetFocus, this);
monster_name_text->Unbind(wxEVT_KILL_FOCUS, &MonsterPalettePanel::OnKillFocus, this);
monster_name_text->Unbind(wxEVT_TEXT_ENTER, &MonsterPalettePanel::OnChangeMonsterNameSearch, this);
}

PaletteType MonsterPalettePanel::GetType() const {
Expand Down Expand Up @@ -208,7 +218,6 @@ void MonsterPalettePanel::SelectTileset(size_t index) {
monster_brush_button->Enable(false);
} else {
const TilesetCategory* tsc = reinterpret_cast<const TilesetCategory*>(tileset_choice->GetClientData(index));
// Select first house
for (BrushVector::const_iterator iter = tsc->brushlist.begin();
iter != tsc->brushlist.end();
++iter) {
Expand Down Expand Up @@ -297,5 +306,35 @@ void MonsterPalettePanel::OnChangeSpawnMonsterSize(wxSpinEvent &event) {
}
}

void MonsterPalettePanel::OnChangeMonsterName(wxCommandEvent &event) {
void MonsterPalettePanel::OnSetFocus(wxFocusEvent &event) {
g_gui.DisableHotkeys();
event.Skip();
}

void MonsterPalettePanel::OnKillFocus(wxFocusEvent &event) {
g_gui.EnableHotkeys();
event.Skip();
}

void MonsterPalettePanel::OnChangeMonsterNameSearch(wxCommandEvent &event) {
const auto monsterNameSearch = as_lower_str(monster_name_text->GetValue().ToStdString());

const auto index = tileset_choice->GetSelection();

if (monsterNameSearch.empty()) {
SelectTileset(index);
return;
}

monster_list->Clear();
const auto tilesetCategory = reinterpret_cast<const TilesetCategory*>(tileset_choice->GetClientData(index));
for (auto it = tilesetCategory->brushlist.begin(); it != tilesetCategory->brushlist.end(); ++it) {
const auto monsterName = wxstr((*it)->getName());
const auto regexPattern = std::regex(monsterNameSearch);
if (std::regex_search(as_lower_str(monsterName.ToStdString()), regexPattern)) {
monster_list->Append(monsterName, *it);
}
}
monster_list->Sort();
Update();
}
5 changes: 4 additions & 1 deletion source/palette_monster.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,14 +57,17 @@ class MonsterPalettePanel : public PalettePanel {
void OnListBoxChange(wxCommandEvent &event);
void OnClickMonsterBrushButton(wxCommandEvent &event);
void OnClickSpawnMonsterBrushButton(wxCommandEvent &event);
void OnChangeMonsterName(wxCommandEvent &event);
void OnSetFocus(wxFocusEvent &event);
void OnKillFocus(wxFocusEvent &event);
void OnChangeMonsterNameSearch(wxCommandEvent &event);

protected:
void SelectMonsterBrush();
void SelectSpawnBrush();

wxChoice* tileset_choice;
wxTextCtrl* monster_name_text;
wxButton* monster_search_button;
SortableListBox* monster_list;
wxToggleButton* monster_brush_button;
wxToggleButton* spawn_monster_brush_button;
Expand Down
Loading