Skip to content

Y
ygopro
Commit b3ece47a authored by mercury233's avatar mercury233
Browse files
Options

Merge branch 'fh' into test

parents 64b0f932 ee2dd22c
Hide whitespace changes
Inline Side-by-side
Showing with 4 additions and 0 deletions
gframe/deck_con.cpp
View file @ b3ece47a
...@@ -222,6 +222,7 @@ bool DeckBuilder::OnEvent(const irr::SEvent& event) { ...@@ -222,6 +222,7 @@ bool DeckBuilder::OnEvent(const irr::SEvent& event) {
for(int i = 0; i < 32; ++i, filter <<= 1) for(int i = 0; i < 32; ++i, filter <<= 1)
if(mainGame->chkCategory[i]->isChecked()) if(mainGame->chkCategory[i]->isChecked())
filter_effect |= filter; filter_effect |= filter;
mainGame->btnEffectFilter->setPressed(filter_effect > 0);
mainGame->HideElement(mainGame->wCategories); mainGame->HideElement(mainGame->wCategories);
InstantSearch(); InstantSearch();
break; break;
...@@ -322,6 +323,7 @@ bool DeckBuilder::OnEvent(const irr::SEvent& event) { ...@@ -322,6 +323,7 @@ bool DeckBuilder::OnEvent(const irr::SEvent& event) {
if (mainGame->btnMark[7]->isPressed()) if (mainGame->btnMark[7]->isPressed())
filter_marks |= 0004; filter_marks |= 0004;
mainGame->HideElement(mainGame->wLinkMarks); mainGame->HideElement(mainGame->wLinkMarks);
mainGame->btnMarksFilter->setPressed(filter_marks > 0);
InstantSearch(); InstantSearch();
break; break;
} }
...@@ -913,6 +915,8 @@ void DeckBuilder::ClearFilter() { ...@@ -913,6 +915,8 @@ void DeckBuilder::ClearFilter() {
filter_marks = 0; filter_marks = 0;
for(int i = 0; i < 8; i++) for(int i = 0; i < 8; i++)
mainGame->btnMark[i]->setPressed(false); mainGame->btnMark[i]->setPressed(false);
mainGame->btnEffectFilter->setPressed(false);
mainGame->btnMarksFilter->setPressed(false);
} }
void DeckBuilder::SortList() { void DeckBuilder::SortList() {
auto left = results.begin(); auto left = results.begin();
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment