Skip to content

Y
ygopro-2pick
Commit 2fc0d00d authored by nanahira's avatar nanahira
Browse files
Options

Merge branch 'master' into server

parents 2d1cfba2 d2697ee8
Hide whitespace changes
Inline Side-by-side
Showing with 10 additions and 9 deletions
gframe/client_field.cpp
View file @ 2fc0d00d
...@@ -623,23 +623,24 @@ void ClientField::ShowSelectOption(int select_hint) { ...@@ -623,23 +623,24 @@ void ClientField::ShowSelectOption(int select_hint) {
mainGame->btnOptionOK->setVisible(false); mainGame->btnOptionOK->setVisible(false);
for(int i = 0; i < 5; i++) for(int i = 0; i < 5; i++)
mainGame->btnOption[i]->setVisible(i < count); mainGame->btnOption[i]->setVisible(i < count);
recti loc = mainGame->wOptions->getRelativePosition(); recti pos = mainGame->wOptions->getRelativePosition();
loc.LowerRightCorner.Y = loc.UpperLeftCorner.Y + 30 + 40 * count; int newheight = 30 + 40 * count;
mainGame->wOptions->setRelativePosition(loc); int oldheight = pos.LowerRightCorner.Y - pos.UpperLeftCorner.Y;
pos.UpperLeftCorner.Y = pos.UpperLeftCorner.Y + (oldheight - newheight) / 2;
pos.LowerRightCorner.Y = pos.UpperLeftCorner.Y + newheight;
mainGame->wOptions->setRelativePosition(pos);
} else { } else {
mainGame->SetStaticText(mainGame->stOptions, 310, mainGame->guiFont, mainGame->SetStaticText(mainGame->stOptions, 310, mainGame->guiFont,
(wchar_t*)dataManager.GetDesc(select_options[0])); (wchar_t*)dataManager.GetDesc(select_options[0]));
mainGame->stOptions->setVisible(true); mainGame->stOptions->setVisible(true);
mainGame->btnOptionp->setVisible(false); mainGame->btnOptionp->setVisible(false);
if(count > 1) mainGame->btnOptionn->setVisible(count > 1);
mainGame->btnOptionn->setVisible(true);
else mainGame->btnOptionn->setVisible(false);
mainGame->btnOptionOK->setVisible(true); mainGame->btnOptionOK->setVisible(true);
for(int i = 0; i < 5; i++) for(int i = 0; i < 5; i++)
mainGame->btnOption[i]->setVisible(false); mainGame->btnOption[i]->setVisible(false);
recti loc = mainGame->wOptions->getRelativePosition(); recti pos = mainGame->wOptions->getRelativePosition();
loc.LowerRightCorner.Y = loc.UpperLeftCorner.Y + 140; pos.LowerRightCorner.Y = pos.UpperLeftCorner.Y + 140;
mainGame->wOptions->setRelativePosition(loc); mainGame->wOptions->setRelativePosition(pos);
} }
if(select_hint) if(select_hint)
myswprintf(textBuffer, L"%ls", dataManager.GetDesc(select_hint)); myswprintf(textBuffer, L"%ls", dataManager.GetDesc(select_hint));
......
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