Skip to content

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

Merge branch 'resize' into test

parents ee31f8da 1b117f0e
Hide whitespace changes
Inline Side-by-side
Showing with 6 additions and 6 deletions
gframe/game.cpp
View file @ 34e706c3
...@@ -1284,16 +1284,16 @@ void Game::ShowCardInfo(int code) { ...@@ -1284,16 +1284,16 @@ void Game::ShowCardInfo(int code) {
wcscat(formatBuffer, scaleBuffer); wcscat(formatBuffer, scaleBuffer);
} }
stDataInfo->setText(formatBuffer); stDataInfo->setText(formatBuffer);
stSetName->setRelativePosition(Resize(15, 83, 296, 106)); stSetName->setRelativePosition(rect<s32>(15, 83, 296 * xScale, 106));
stText->setRelativePosition(Resize(15, 83 + offset, 287, 324)); stText->setRelativePosition(rect<s32>(15, 83 + offset, 287 * xScale, 324 * yScale));
scrCardText->setRelativePosition(Resize(267, 83 + offset, 287, 324)); scrCardText->setRelativePosition(rect<s32>(287 * xScale - 20, 83 + offset, 287 * xScale, 324 * yScale));
} else { } else {
myswprintf(formatBuffer, L"[%ls]", dataManager.FormatType(cd.type)); myswprintf(formatBuffer, L"[%ls]", dataManager.FormatType(cd.type));
stInfo->setText(formatBuffer); stInfo->setText(formatBuffer);
stDataInfo->setText(L""); stDataInfo->setText(L"");
stSetName->setRelativePosition(Resize(15, 60, 296, 83)); stSetName->setRelativePosition(rect<s32>(15, 60, 296 * xScale, 83));
stText->setRelativePosition(Resize(15, 60 + offset, 287, 324)); stText->setRelativePosition(rect<s32>(15, 60 + offset, 287 * xScale, 324 * yScale));
scrCardText->setRelativePosition(Resize(267, 60 + offset, 287, 324)); scrCardText->setRelativePosition(rect<s32>(287 * xScale - 20, 60 + offset, 287 * xScale, 324 * yScale));
} }
showingtext = dataManager.GetText(code); showingtext = dataManager.GetText(code);
const auto& tsize = stText->getRelativePosition(); const auto& tsize = stText->getRelativePosition();
......
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