Skip to content

Y
ygopro
Commit b6e22428 authored by salix5's avatar salix5
Browse files
Options

Merge pull request #1577 from DailyShana/patch-2 

fix showing selectable cards when scroll bar changed
parents e51b1284 838d039e
Hide whitespace changes
Inline Side-by-side
Showing with 12 additions and 6 deletions
gframe/event_handler.cpp
View file @ b6e22428
...@@ -733,15 +733,21 @@ bool ClientField::OnEvent(const irr::SEvent& event) { ...@@ -733,15 +733,21 @@ bool ClientField::OnEvent(const irr::SEvent& event) {
else else
mainGame->btnCardSelect[i]->setImage(imageManager.tCover); mainGame->btnCardSelect[i]->setImage(imageManager.tCover);
mainGame->btnCardSelect[i]->setRelativePosition(rect<s32>(30 + i * 125, 55, 30 + 120 + i * 125, 225)); mainGame->btnCardSelect[i]->setRelativePosition(rect<s32>(30 + i * 125, 55, 30 + 120 + i * 125, 225));
if (sort_list.size()){ if(sort_list.size()) {
if (sort_list[pos + i]> 0) if(sort_list[pos + i] > 0)
myswprintf(formatBuffer, L"%d", sort_list[pos + i]); myswprintf(formatBuffer, L"%d", sort_list[pos + i]);
else else
myswprintf(formatBuffer, L""); myswprintf(formatBuffer, L"");
} } else {
else{ if(selectable_cards[i + pos]->is_conti)
myswprintf(formatBuffer, L"%ls[%d]", dataManager.FormatLocation(selectable_cards[i + pos]->location, myswprintf(formatBuffer, L"%ls", DataManager::unknown_string);
selectable_cards[i + pos]->sequence), selectable_cards[i + pos]->sequence + 1); else if(selectable_cards[i + pos]->location == LOCATION_OVERLAY)
myswprintf(formatBuffer, L"%ls[%d]",
dataManager.FormatLocation(selectable_cards[i + pos]->overlayTarget->location, selectable_cards[i + pos]->overlayTarget->sequence),
selectable_cards[i + pos]->overlayTarget->sequence + 1);
else
myswprintf(formatBuffer, L"%ls[%d]", dataManager.FormatLocation(selectable_cards[i + pos]->location, selectable_cards[i + pos]->sequence),
selectable_cards[i + pos]->sequence + 1);
} }
mainGame->stCardPos[i]->setText(formatBuffer); mainGame->stCardPos[i]->setText(formatBuffer);
if(selectable_cards[i + pos]->is_selected) if(selectable_cards[i + pos]->is_selected)
......
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