Commit 9ce1d52d authored by fallenstardust's avatar fallenstardust

增加点击消黑块的区域

停用drago Filter
扩大scrFilter
parent b87c4e65
......@@ -1209,21 +1209,14 @@ bool DeckBuilder::OnEvent(const irr::SEvent& event) {
is_starting_dragging = false;
}
mouse_pos.set(event.MouseInput.X, event.MouseInput.Y);
if(hovered_pos == 4 && mainGame->scrFilter->isVisible()) {
int dragpos = dragy - mouse_pos.Y;
char log_dragpos[256];
sprintf(log_dragpos, "dragpos=%d", dragpos);
os::Printer::log(log_dragpos);
if(dragpos > 0 && mainGame->scrFilter->getPos() < mainGame->scrFilter->getMax()) {
/* if(hovered_pos == 4 && mainGame->scrFilter->isVisible()) {
if(dragy - mouse_pos.Y > 0 && mainGame->scrFilter->getPos() < mainGame->scrFilter->getMax()) {
mainGame->scrFilter->setPos(mainGame->scrFilter->getPos() + 1);
} else if(dragpos < 0 && mainGame->scrFilter->getPos() > 0){
} else if(dragy - mouse_pos.Y < 0 && mainGame->scrFilter->getPos() > 0){
mainGame->scrFilter->setPos(mainGame->scrFilter->getPos() - 1);
}
}
}*/
GetHoveredCard();
char log_hovered_card[256];
sprintf(log_hovered_card, "卡名=%ls,scrfilterpos=%d", dataManager.GetName(hovered_code),(mainGame->scrFilter->getPos()));
os::Printer::log(log_hovered_card);
break;
}
case irr::EMIE_MOUSE_WHEEL: {
......
......@@ -2091,7 +2091,11 @@ bool ClientField::OnCommonEvent(const irr::SEvent& event) {
}
case irr::EMIE_LMOUSE_LEFT_UP: {
if (root->getElementFromPoint(mousepos) == mainGame->stText ||
root->getElementFromPoint(mousepos) == mainGame->wHostPrepare) {
root->getElementFromPoint(mousepos) == mainGame->wHostPrepare ||
root->getElementFromPoint(mousepos) == mainGame->imgCard ||
root->getElementFromPoint(mousepos) == mainGame->wReplay ||
root->getElementFromPoint(mousepos) == mainGame->wSinglePlay ||
root->getElementFromPoint(mousepos) == mainGame->wLanWindow) {
mainGame->gMutex.lock();
mainGame->textFont->setTransparency(true);
mainGame->ClearChatMsg();
......
......@@ -824,7 +824,7 @@ bool Game::Initialize() {
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));
#ifdef _IRR_ANDROID_PLATFORM_
scrFilter = env->addScrollBar(false, recti(995 * xScale, 159 * yScale, 1020 * xScale, 629 * yScale), 0, SCROLL_FILTER);
scrFilter = env->addScrollBar(false, recti(990 * xScale, 159 * yScale, 1020 * xScale, 629 * yScale), 0, SCROLL_FILTER);
#endif
scrFilter->setLargeStep(10);
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