Skip to content

Y
YGOMobile
Commit e4b02896 authored by fallenstardust's avatar fallenstardust
Browse files
Options

blur deck combobox after selecting

parent 4cb4a1dd
Hide whitespace changes
Inline Side-by-side
Showing with 15 additions and 16 deletions
Classes/gframe/deck_con.cpp
View file @ e4b02896
...@@ -987,6 +987,7 @@ bool DeckBuilder::OnEvent(const irr::SEvent& event) { ...@@ -987,6 +987,7 @@ bool DeckBuilder::OnEvent(const irr::SEvent& event) {
break; break;
} }
} }
mainGame->env->setFocus(0);
InstantSearch(); InstantSearch();
break; break;
} }
...@@ -1004,12 +1005,14 @@ bool DeckBuilder::OnEvent(const irr::SEvent& event) { ...@@ -1004,12 +1005,14 @@ bool DeckBuilder::OnEvent(const irr::SEvent& event) {
mainGame->ebDefense->setEnabled(true); mainGame->ebDefense->setEnabled(true);
} }
} }
mainGame->env->setFocus(0);
InstantSearch(); InstantSearch();
break; break;
} }
case COMBOBOX_ATTRIBUTE: case COMBOBOX_ATTRIBUTE:
case COMBOBOX_RACE: case COMBOBOX_RACE:
case COMBOBOX_LIMIT: case COMBOBOX_LIMIT:
mainGame->env->setFocus(0);
InstantSearch(); InstantSearch();
} }
} }
...@@ -1205,19 +1208,15 @@ bool DeckBuilder::OnEvent(const irr::SEvent& event) { ...@@ -1205,19 +1208,15 @@ bool DeckBuilder::OnEvent(const irr::SEvent& event) {
is_starting_dragging = false; is_starting_dragging = false;
} }
mouse_pos.set(event.MouseInput.X, event.MouseInput.Y); mouse_pos.set(event.MouseInput.X, event.MouseInput.Y);
if(hovered_pos == 4) { if(hovered_pos == 4 && mainGame->scrFilter->isVisible()) {
int dragpos = dragy - mouse_pos.Y; int dragpos = dragy - mouse_pos.Y;
char log_dragpos[256]; char log_dragpos[256];
sprintf(log_dragpos, "dragpos=%d", dragpos); sprintf(log_dragpos, "dragpos=%d", dragpos);
os::Printer::log(log_dragpos); os::Printer::log(log_dragpos);
if(dragpos > 0) { if(dragpos > 0 && mainGame->scrFilter->getPos() < mainGame->scrFilter->getMax()) {
if(mainGame->scrFilter->getPos() < mainGame->scrFilter->getMax()) mainGame->scrFilter->setPos(mainGame->scrFilter->getPos() + 1);
mainGame->scrFilter->setPos((mainGame->scrFilter->getPos() + 1)); } else if(dragpos < 0 && mainGame->scrFilter->getPos() > 0){
} else if(dragpos < 0){ mainGame->scrFilter->setPos(mainGame->scrFilter->getPos() - 1);
if(mainGame->scrFilter->getPos() > 0)
mainGame->scrFilter->setPos((mainGame->scrFilter->getPos() - 1));
} else {
} }
} }
GetHoveredCard(); GetHoveredCard();
...@@ -1318,14 +1317,14 @@ void DeckBuilder::GetHoveredCard() { ...@@ -1318,14 +1317,14 @@ void DeckBuilder::GetHoveredCard() {
} }
} }
} else if(x >= 805 * mainGame->xScale && x <= 995 * mainGame->xScale && y >= 165 * mainGame->yScale && y <= 626 * mainGame->yScale) { } else if(x >= 805 * mainGame->xScale && x <= 995 * mainGame->xScale && y >= 165 * mainGame->yScale && y <= 626 * mainGame->yScale) {
hovered_pos = 4; hovered_pos = 4;
hovered_seq = (y - 165 * mainGame->yScale) / (66 * mainGame->yScale); hovered_seq = (y - 165 * mainGame->yScale) / (66 * mainGame->yScale);
int pos = mainGame->scrFilter->getPos() + hovered_seq; int pos = mainGame->scrFilter->getPos() + hovered_seq;
if(pos >= (int)results.size()) { if(pos >= (int)results.size()) {
hovered_seq = -1; hovered_seq = -1;
hovered_code = 0; hovered_code = 0;
} else if(x >= 805 * mainGame->xScale && x <= 850 * mainGame->xScale) { } else if(x >= 805 * mainGame->xScale && x <= 850 * mainGame->xScale) {
hovered_code = results[pos]->first; hovered_code = results[pos]->first;
} else if(x > 850 * mainGame->xScale && x <= 995 * mainGame->xScale) { } else if(x > 850 * mainGame->xScale && x <= 995 * mainGame->xScale) {
mainGame->ShowCardInfo(results[pos]->first); mainGame->ShowCardInfo(results[pos]->first);
} }
...@@ -1491,7 +1490,7 @@ void DeckBuilder::FilterCards() { ...@@ -1491,7 +1490,7 @@ void DeckBuilder::FilterCards() {
if(filter_marks && (data.link_marker & filter_marks)!= filter_marks) if(filter_marks && (data.link_marker & filter_marks)!= filter_marks)
continue; continue;
if(filter_lm) { if(filter_lm) {
if(filter_lm <= 3 && (!filterList->count(ptr->first) || (*filterList)[ptr->first] != filter_lm - 1)) if(filter_lm <= 3 && (!filterList->count(ptr->first) || (*filterList).at(ptr->first) != filter_lm - 1))
continue; continue;
if(filter_lm == 4 && data.ot != 1) if(filter_lm == 4 && data.ot != 1)
continue; continue;
...@@ -1644,7 +1643,7 @@ bool DeckBuilder::CardNameContains(const wchar_t *haystack, const wchar_t *needl ...@@ -1644,7 +1643,7 @@ bool DeckBuilder::CardNameContains(const wchar_t *haystack, const wchar_t *needl
return true; return true;
} }
} else { } else {
i -= j; i -= j;
j = 0; j = 0;
} }
i++; i++;
......
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