Skip to content

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

size of stCardPos[i] 

Now it is equal to the image button.
parent df03e9b8
Hide whitespace changes
Inline Side-by-side
Showing with 9 additions and 8 deletions
gframe/client_field.cpp
View file @ d06a8803
...@@ -349,6 +349,7 @@ void ClientField::ClearChainSelect() { ...@@ -349,6 +349,7 @@ void ClientField::ClearChainSelect() {
remove_act = false; remove_act = false;
extra_act = false; extra_act = false;
} }
// needs to be synchronized with EGET_SCROLL_BAR_CHANGED
void ClientField::ShowSelectCard(bool buttonok, bool chain) { void ClientField::ShowSelectCard(bool buttonok, bool chain) {
if(selectable_cards.size() <= 5) { if(selectable_cards.size() <= 5) {
int startpos = 30 + 125 * (5 - selectable_cards.size()) / 2; int startpos = 30 + 125 * (5 - selectable_cards.size()) / 2;
...@@ -384,7 +385,7 @@ void ClientField::ShowSelectCard(bool buttonok, bool chain) { ...@@ -384,7 +385,7 @@ void ClientField::ShowSelectCard(bool buttonok, bool chain) {
} else mainGame->stCardPos[i]->setText(L""); } else mainGame->stCardPos[i]->setText(L"");
mainGame->stCardPos[i]->setBackgroundColor(0xffffffff); mainGame->stCardPos[i]->setBackgroundColor(0xffffffff);
} }
mainGame->stCardPos[i]->setRelativePosition(rect<s32>(startpos + 10 + i * 125, 30, startpos + 109 + i * 125, 50)); mainGame->stCardPos[i]->setRelativePosition(rect<s32>(startpos + i * 125, 30, startpos + 120 + i * 125, 50));
} }
for(int i = selectable_cards.size(); i < 5; ++i) { for(int i = selectable_cards.size(); i < 5; ++i) {
mainGame->btnCardSelect[i]->setVisible(false); mainGame->btnCardSelect[i]->setVisible(false);
...@@ -425,7 +426,7 @@ void ClientField::ShowSelectCard(bool buttonok, bool chain) { ...@@ -425,7 +426,7 @@ void ClientField::ShowSelectCard(bool buttonok, bool chain) {
} else mainGame->stCardPos[i]->setText(L""); } else mainGame->stCardPos[i]->setText(L"");
mainGame->stCardPos[i]->setBackgroundColor(0xffffffff); mainGame->stCardPos[i]->setBackgroundColor(0xffffffff);
} }
mainGame->stCardPos[i]->setRelativePosition(rect<s32>(40 + i * 125, 30, 139 + i * 125, 50)); mainGame->stCardPos[i]->setRelativePosition(rect<s32>(30 + i * 125, 30, 150 + i * 125, 50));
} }
mainGame->scrCardList->setVisible(true); mainGame->scrCardList->setVisible(true);
mainGame->scrCardList->setMin(0); mainGame->scrCardList->setMin(0);
...@@ -455,7 +456,7 @@ void ClientField::ShowChainCard() { ...@@ -455,7 +456,7 @@ void ClientField::ShowChainCard() {
if(selectable_cards[i]->controler) if(selectable_cards[i]->controler)
mainGame->stCardPos[i]->setBackgroundColor(0xffd0d0d0); mainGame->stCardPos[i]->setBackgroundColor(0xffd0d0d0);
else mainGame->stCardPos[i]->setBackgroundColor(0xffffffff); else mainGame->stCardPos[i]->setBackgroundColor(0xffffffff);
mainGame->stCardPos[i]->setRelativePosition(rect<s32>(startpos + 10 + i * 125, 30, startpos + 109 + i * 125, 50)); mainGame->stCardPos[i]->setRelativePosition(rect<s32>(startpos + i * 125, 30, startpos + 120 + i * 125, 50));
} }
for(int i = selectable_cards.size(); i < 5; ++i) { for(int i = selectable_cards.size(); i < 5; ++i) {
mainGame->btnCardSelect[i]->setVisible(false); mainGame->btnCardSelect[i]->setVisible(false);
...@@ -479,7 +480,7 @@ void ClientField::ShowChainCard() { ...@@ -479,7 +480,7 @@ void ClientField::ShowChainCard() {
if(selectable_cards[i]->controler) if(selectable_cards[i]->controler)
mainGame->stCardPos[i]->setBackgroundColor(0xffd0d0d0); mainGame->stCardPos[i]->setBackgroundColor(0xffd0d0d0);
else mainGame->stCardPos[i]->setBackgroundColor(0xffffffff); else mainGame->stCardPos[i]->setBackgroundColor(0xffffffff);
mainGame->stCardPos[i]->setRelativePosition(rect<s32>(40 + i * 125, 30, 139 + i * 125, 50)); mainGame->stCardPos[i]->setRelativePosition(rect<s32>(30 + i * 125, 30, 150 + i * 125, 50));
} }
mainGame->scrCardList->setVisible(true); mainGame->scrCardList->setVisible(true);
mainGame->scrCardList->setMin(0); mainGame->scrCardList->setMin(0);
...@@ -509,7 +510,7 @@ void ClientField::ShowLocationCard() { ...@@ -509,7 +510,7 @@ void ClientField::ShowLocationCard() {
if(display_cards[i]->controler) if(display_cards[i]->controler)
mainGame->stDisplayPos[i]->setBackgroundColor(0xffd0d0d0); mainGame->stDisplayPos[i]->setBackgroundColor(0xffd0d0d0);
else mainGame->stDisplayPos[i]->setBackgroundColor(0xffffffff); else mainGame->stDisplayPos[i]->setBackgroundColor(0xffffffff);
mainGame->stDisplayPos[i]->setRelativePosition(rect<s32>(startpos + 10 + i * 125, 30, startpos + 109 + i * 125, 50)); mainGame->stDisplayPos[i]->setRelativePosition(rect<s32>(startpos + i * 125, 30, startpos + 120 + i * 125, 50));
} }
for(int i = display_cards.size(); i < 5; ++i) { for(int i = display_cards.size(); i < 5; ++i) {
mainGame->btnCardDisplay[i]->setVisible(false); mainGame->btnCardDisplay[i]->setVisible(false);
...@@ -533,7 +534,7 @@ void ClientField::ShowLocationCard() { ...@@ -533,7 +534,7 @@ void ClientField::ShowLocationCard() {
if(display_cards[i]->controler) if(display_cards[i]->controler)
mainGame->stDisplayPos[i]->setBackgroundColor(0xffd0d0d0); mainGame->stDisplayPos[i]->setBackgroundColor(0xffd0d0d0);
else mainGame->stDisplayPos[i]->setBackgroundColor(0xffffffff); else mainGame->stDisplayPos[i]->setBackgroundColor(0xffffffff);
mainGame->stDisplayPos[i]->setRelativePosition(rect<s32>(40 + i * 125, 30, 139 + i * 125, 50)); mainGame->stDisplayPos[i]->setRelativePosition(rect<s32>(30 + i * 125, 30, 150 + i * 125, 50));
} }
mainGame->scrDisplayList->setVisible(true); mainGame->scrDisplayList->setVisible(true);
mainGame->scrDisplayList->setMin(0); mainGame->scrDisplayList->setMin(0);
......
gframe/game.cpp
View file @ d06a8803
...@@ -333,7 +333,7 @@ bool Game::Initialize() { ...@@ -333,7 +333,7 @@ bool Game::Initialize() {
wCardSelect->getCloseButton()->setVisible(false); wCardSelect->getCloseButton()->setVisible(false);
wCardSelect->setVisible(false); wCardSelect->setVisible(false);
for(int i = 0; i < 5; ++i) { for(int i = 0; i < 5; ++i) {
stCardPos[i] = env->addStaticText(L"", rect<s32>(40 + 125 * i, 30, 139 + 125 * i, 50), true, false, wCardSelect, -1, true); stCardPos[i] = env->addStaticText(L"", rect<s32>(30 + 125 * i, 30, 150 + 125 * i, 50), true, false, wCardSelect, -1, true);
stCardPos[i]->setBackgroundColor(0xffffffff); stCardPos[i]->setBackgroundColor(0xffffffff);
stCardPos[i]->setTextAlignment(irr::gui::EGUIA_CENTER, irr::gui::EGUIA_CENTER); stCardPos[i]->setTextAlignment(irr::gui::EGUIA_CENTER, irr::gui::EGUIA_CENTER);
btnCardSelect[i] = irr::gui::CGUIImageButton::addImageButton(env, rect<s32>(30 + 125 * i, 55, 150 + 125 * i, 225), wCardSelect, BUTTON_CARD_0 + i); btnCardSelect[i] = irr::gui::CGUIImageButton::addImageButton(env, rect<s32>(30 + 125 * i, 55, 150 + 125 * i, 225), wCardSelect, BUTTON_CARD_0 + i);
...@@ -346,7 +346,7 @@ bool Game::Initialize() { ...@@ -346,7 +346,7 @@ bool Game::Initialize() {
wCardDisplay->getCloseButton()->setVisible(false); wCardDisplay->getCloseButton()->setVisible(false);
wCardDisplay->setVisible(false); wCardDisplay->setVisible(false);
for(int i = 0; i < 5; ++i) { for(int i = 0; i < 5; ++i) {
stDisplayPos[i] = env->addStaticText(L"", rect<s32>(40 + 125 * i, 30, 139 + 125 * i, 50), true, false, wCardDisplay, -1, true); stDisplayPos[i] = env->addStaticText(L"", rect<s32>(30 + 125 * i, 30, 150 + 125 * i, 50), true, false, wCardDisplay, -1, true);
stDisplayPos[i]->setBackgroundColor(0xffffffff); stDisplayPos[i]->setBackgroundColor(0xffffffff);
stDisplayPos[i]->setTextAlignment(irr::gui::EGUIA_CENTER, irr::gui::EGUIA_CENTER); stDisplayPos[i]->setTextAlignment(irr::gui::EGUIA_CENTER, irr::gui::EGUIA_CENTER);
btnCardDisplay[i] = irr::gui::CGUIImageButton::addImageButton(env, rect<s32>(30 + 125 * i, 55, 150 + 125 * i, 225), wCardDisplay, BUTTON_DISPLAY_0 + i); btnCardDisplay[i] = irr::gui::CGUIImageButton::addImageButton(env, rect<s32>(30 + 125 * i, 55, 150 + 125 * i, 225), wCardDisplay, BUTTON_DISPLAY_0 + i);
......
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