Commit 99344bde authored by fallenstardust's avatar fallenstardust

fix filter

parent 3038b70b
...@@ -1317,11 +1317,13 @@ void DeckBuilder::GetHoveredCard() { ...@@ -1317,11 +1317,13 @@ void DeckBuilder::GetHoveredCard() {
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) {
} else {
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);
} }
} }
if(is_draging) { if(is_draging) {
dragx = x; dragx = x;
......
...@@ -824,7 +824,7 @@ bool Game::Initialize() { ...@@ -824,7 +824,7 @@ bool Game::Initialize() {
for(int i = 0; i < 32; ++i) for(int i = 0; i < 32; ++i)
chkCategory[i] = env->addCheckBox(false, recti((10 + (i % 4) * 90) * xScale, (10 + (i / 4) * 20) * yScale, (100 + (i % 4) * 90) * xScale, (40 + (i / 4) * 20) * yScale), wCategories, -1, dataManager.GetSysString(1100 + i)); chkCategory[i] = env->addCheckBox(false, recti((10 + (i % 4) * 90) * xScale, (10 + (i / 4) * 20) * yScale, (100 + (i % 4) * 90) * xScale, (40 + (i / 4) * 20) * yScale), wCategories, -1, dataManager.GetSysString(1100 + i));
#ifdef _IRR_ANDROID_PLATFORM_ #ifdef _IRR_ANDROID_PLATFORM_
scrFilter = env->addScrollBar(false, recti(990 * xScale, 159 * yScale, 1020 * xScale, 629 * yScale), 0, SCROLL_FILTER); scrFilter = env->addScrollBar(false, recti(980 * xScale, 159 * yScale, 1020 * xScale, 629 * yScale), 0, SCROLL_FILTER);
#endif #endif
scrFilter->setLargeStep(10); scrFilter->setLargeStep(10);
scrFilter->setSmallStep(1); scrFilter->setSmallStep(1);
......
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