Skip to content

Y
YGOMobile
Commit 85467daa authored by fallenstardust's avatar fallenstardust
Browse files
Options

对话框添加背景，微调布局

parent 11b0741c
Show whitespace changes
Inline Side-by-side
Showing with 92 additions and 35 deletions
Classes/gframe/client_field.cpp
View file @ 85467daa
...@@ -638,12 +638,13 @@ void ClientField::ShowSelectOption(int select_hint) { ...@@ -638,12 +638,13 @@ void ClientField::ShowSelectOption(int select_hint) {
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 pos = mainGame->wOptions->getRelativePosition(); recti pos = mainGame->wOptions->getRelativePosition();
int newheight = 30 + 70 * (scrollbar ? 5 : count) * mainGame->yScale; int newheight = 50 + 60 * (scrollbar ? 5 : count) * mainGame->yScale;
int oldheight = pos.LowerRightCorner.Y - pos.UpperLeftCorner.Y; int oldheight = pos.LowerRightCorner.Y - pos.UpperLeftCorner.Y;
pos.UpperLeftCorner.Y = pos.UpperLeftCorner.Y + (oldheight - newheight) / 2; pos.UpperLeftCorner.Y = pos.UpperLeftCorner.Y + (oldheight - newheight) / 2;
pos.LowerRightCorner.X = pos.UpperLeftCorner.X + (scrollbar ? 405 : 390) * mainGame->xScale; pos.LowerRightCorner.X = pos.UpperLeftCorner.X + (scrollbar ? 405 : 390) * mainGame->xScale;
pos.LowerRightCorner.Y = pos.UpperLeftCorner.Y + newheight; pos.LowerRightCorner.Y = pos.UpperLeftCorner.Y + newheight;
mainGame->wOptions->setRelativePosition(pos); mainGame->wOptions->setRelativePosition(pos);
mainGame->bgOptions->setRelativePosition(rect<s32>(0, 0, (scrollbar ? 405 : 390) * mainGame->xScale, pos.LowerRightCorner.Y - pos.UpperLeftCorner.Y));
} else { } else {
mainGame->SetStaticText(mainGame->stOptions, 370 * mainGame->xScale, mainGame->guiFont, mainGame->SetStaticText(mainGame->stOptions, 370 * mainGame->xScale, mainGame->guiFont,
(wchar_t*)dataManager.GetDesc(select_options[0])); (wchar_t*)dataManager.GetDesc(select_options[0]));
...@@ -651,11 +652,13 @@ void ClientField::ShowSelectOption(int select_hint) { ...@@ -651,11 +652,13 @@ void ClientField::ShowSelectOption(int select_hint) {
mainGame->btnOptionp->setVisible(false); mainGame->btnOptionp->setVisible(false);
mainGame->btnOptionn->setVisible(count > 1); mainGame->btnOptionn->setVisible(count > 1);
mainGame->btnOptionOK->setVisible(true); mainGame->btnOptionOK->setVisible(true);
mainGame->scrOption->setVisible(false);
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 pos = mainGame->wOptions->getRelativePosition(); recti pos = mainGame->wOptions->getRelativePosition();
pos.LowerRightCorner.Y = pos.UpperLeftCorner.Y + 180 * mainGame->yScale; pos.LowerRightCorner.Y = pos.UpperLeftCorner.Y + 180 * mainGame->yScale;
mainGame->wOptions->setRelativePosition(pos); mainGame->wOptions->setRelativePosition(pos);
mainGame->bgOptions->setRelativePosition(rect<s32>(0, 0, 390 * mainGame->xScale, pos.LowerRightCorner.Y - pos.UpperLeftCorner.Y));
} }
if(select_hint) if(select_hint)
myswprintf(textBuffer, L"%ls", dataManager.GetDesc(select_hint)); myswprintf(textBuffer, L"%ls", dataManager.GetDesc(select_hint));
......
Classes/gframe/duelclient.cpp
View file @ 85467daa
...@@ -1795,28 +1795,28 @@ int DuelClient::ClientAnalyze(char * msg, unsigned int len) { ...@@ -1795,28 +1795,28 @@ int DuelClient::ClientAnalyze(char * msg, unsigned int len) {
} }
if(count == 4) startpos = 10; if(count == 4) startpos = 10;
else if(count == 3) startpos = 82; else if(count == 3) startpos = 82;
else startpos = 155; else startpos = 50;
if(positions & 0x1) { if(positions & 0x1) {
mainGame->imageLoading.insert(std::make_pair(mainGame->btnPSAU, code)); mainGame->imageLoading.insert(std::make_pair(mainGame->btnPSAU, code));
mainGame->btnPSAU->setRelativePosition(rect<s32>(startpos * mainGame->xScale, 45 * mainGame->yScale, (startpos + 140) * mainGame->xScale, 185 * mainGame->yScale)); mainGame->btnPSAU->setRelativePosition(rect<s32>(startpos * mainGame->xScale, 20 * mainGame->yScale, (startpos + 140) * mainGame->xScale, 160 * mainGame->yScale));
mainGame->btnPSAU->setVisible(true); mainGame->btnPSAU->setVisible(true);
startpos += 145; startpos += 150;
} else mainGame->btnPSAU->setVisible(false); } else mainGame->btnPSAU->setVisible(false);
if(positions & 0x2) { if(positions & 0x2) {
mainGame->btnPSAD->setRelativePosition(rect<s32>(startpos * mainGame->xScale, 45 * mainGame->yScale, (startpos + 140) * mainGame->xScale, 185 * mainGame->yScale)); mainGame->btnPSAD->setRelativePosition(rect<s32>(startpos * mainGame->xScale, 20 * mainGame->yScale, (startpos + 140) * mainGame->xScale, 160 * mainGame->yScale));
mainGame->btnPSAD->setVisible(true); mainGame->btnPSAD->setVisible(true);
startpos += 145; startpos += 150;
} else mainGame->btnPSAD->setVisible(false); } else mainGame->btnPSAD->setVisible(false);
if(positions & 0x4) { if(positions & 0x4) {
mainGame->imageLoading.insert(std::make_pair(mainGame->btnPSDU, code)); mainGame->imageLoading.insert(std::make_pair(mainGame->btnPSDU, code));
mainGame->btnPSDU->setRelativePosition(rect<s32>(startpos * mainGame->xScale, 45 * mainGame->yScale, (startpos + 140) * mainGame->xScale, 185 * mainGame->yScale)); mainGame->btnPSDU->setRelativePosition(rect<s32>(startpos * mainGame->xScale, 20 * mainGame->yScale, (startpos + 140) * mainGame->xScale, 160 * mainGame->yScale));
mainGame->btnPSDU->setVisible(true); mainGame->btnPSDU->setVisible(true);
startpos += 145; startpos += 150;
} else mainGame->btnPSDU->setVisible(false); } else mainGame->btnPSDU->setVisible(false);
if(positions & 0x8) { if(positions & 0x8) {
mainGame->btnPSDD->setRelativePosition(rect<s32>(startpos * mainGame->xScale, 45 * mainGame->yScale, (startpos + 140) * mainGame->xScale, 185 * mainGame->yScale)); mainGame->btnPSDD->setRelativePosition(rect<s32>(startpos * mainGame->xScale, 20 * mainGame->yScale, (startpos + 140) * mainGame->xScale, 160 * mainGame->yScale));
mainGame->btnPSDD->setVisible(true); mainGame->btnPSDD->setVisible(true);
startpos += 145; startpos += 150;
} else mainGame->btnPSDD->setVisible(false); } else mainGame->btnPSDD->setVisible(false);
mainGame->gMutex.lock(); mainGame->gMutex.lock();
mainGame->PopupElement(mainGame->wPosSelect); mainGame->PopupElement(mainGame->wPosSelect);
......
Classes/gframe/event_handler.cpp
View file @ 85467daa
...@@ -353,7 +353,7 @@ bool ClientField::OnEvent(const irr::SEvent& event) { ...@@ -353,7 +353,7 @@ bool ClientField::OnEvent(const irr::SEvent& event) {
mainGame->btnOptionn->setVisible(true); mainGame->btnOptionn->setVisible(true);
if(selected_option == 0) if(selected_option == 0)
mainGame->btnOptionp->setVisible(false); mainGame->btnOptionp->setVisible(false);
mainGame->SetStaticText(mainGame->stOptions, 310 * mainGame->xScale, mainGame->textFont, dataManager.GetDesc(select_options[selected_option])); mainGame->SetStaticText(mainGame->stOptions, 350 * mainGame->xScale, mainGame->textFont, dataManager.GetDesc(select_options[selected_option]));
break; break;
} }
case BUTTON_OPTION_NEXT: { case BUTTON_OPTION_NEXT: {
...@@ -362,7 +362,7 @@ bool ClientField::OnEvent(const irr::SEvent& event) { ...@@ -362,7 +362,7 @@ bool ClientField::OnEvent(const irr::SEvent& event) {
mainGame->btnOptionp->setVisible(true); mainGame->btnOptionp->setVisible(true);
if(selected_option == select_options.size() - 1) if(selected_option == select_options.size() - 1)
mainGame->btnOptionn->setVisible(false); mainGame->btnOptionn->setVisible(false);
mainGame->SetStaticText(mainGame->stOptions, 310 * mainGame->xScale, mainGame->textFont, dataManager.GetDesc(select_options[selected_option])); mainGame->SetStaticText(mainGame->stOptions, 350 * mainGame->xScale, mainGame->textFont, dataManager.GetDesc(select_options[selected_option]));
break; break;
} }
case BUTTON_OPTION_0: case BUTTON_OPTION_0:
......
Classes/gframe/game.cpp
View file @ 85467daa
...@@ -548,15 +548,23 @@ bool Game::Initialize(ANDROID_APP app) { ...@@ -548,15 +548,23 @@ bool Game::Initialize(ANDROID_APP app) {
} }
#ifdef _IRR_ANDROID_PLATFORM_ #ifdef _IRR_ANDROID_PLATFORM_
//first or second to go //first or second to go
wFTSelect = env->addWindow(rect<s32>(530 * xScale, 220 * yScale, 800 * xScale, 380 * yScale), false, L""); wFTSelect = env->addWindow(rect<s32>(470 * xScale, 180 * yScale, 860 * xScale, 360 * yScale), false, L"");
wFTSelect->setDrawBackground(false);
wFTSelect->getCloseButton()->setVisible(false); wFTSelect->getCloseButton()->setVisible(false);
wFTSelect->setVisible(false); wFTSelect->setVisible(false);
btnFirst = env->addButton(rect<s32>(10 * xScale, 30 * yScale, 260 * xScale, 75 * yScale), wFTSelect, BUTTON_FIRST, dataManager.GetSysString(100)); bgFTSelect = env->addImage(rect<s32>(0, 0, 390 * xScale, 180 * yScale), wFTSelect, -1, 0, true);
btnSecond = env->addButton(rect<s32>(10 * xScale, 85 * yScale, 260 * xScale, 130 * yScale), wFTSelect, BUTTON_SECOND, dataManager.GetSysString(101)); bgFTSelect->setImage(imageManager.tDialog_L);
bgFTSelect->setScaleImage(true);
btnFirst = env->addButton(rect<s32>(20 * xScale, 35 * yScale, 370 * xScale, 85 * yScale), wFTSelect, BUTTON_FIRST, dataManager.GetSysString(100));
btnSecond = env->addButton(rect<s32>(20 * xScale, 95 * yScale, 370 * xScale, 145 * yScale), wFTSelect, BUTTON_SECOND, dataManager.GetSysString(101));
//message (370) //message (370)
wMessage = env->addWindow(rect<s32>(470 * xScale, 180 * yScale, 860 * xScale, 360 * yScale), false, dataManager.GetSysString(1216)); wMessage = env->addWindow(rect<s32>(470 * xScale, 180 * yScale, 860 * xScale, 360 * yScale), false, dataManager.GetSysString(1216));
wMessage->setDrawBackground(false);
wMessage->getCloseButton()->setVisible(false); wMessage->getCloseButton()->setVisible(false);
wMessage->setVisible(false); wMessage->setVisible(false);
bgMessage = env->addImage(rect<s32>(0, 0, 390 * xScale, 180 * yScale), wMessage, -1, 0, true);
bgMessage->setImage(imageManager.tDialog_L);
bgMessage->setScaleImage(true);
stMessage = env->addStaticText(L"", rect<s32>(20 * xScale, 20 * yScale, 390 * xScale, 100 * yScale), false, true, wMessage, -1, false); stMessage = env->addStaticText(L"", rect<s32>(20 * xScale, 20 * yScale, 390 * xScale, 100 * yScale), false, true, wMessage, -1, false);
stMessage->setTextAlignment(irr::gui::EGUIA_UPPERLEFT, irr::gui::EGUIA_CENTER); stMessage->setTextAlignment(irr::gui::EGUIA_UPPERLEFT, irr::gui::EGUIA_CENTER);
btnMsgOK = env->addButton(rect<s32>(130 * xScale, 115 * yScale, 260 * xScale, 165 * yScale), wMessage, BUTTON_MSG_OK, dataManager.GetSysString(1211)); btnMsgOK = env->addButton(rect<s32>(130 * xScale, 115 * yScale, 260 * xScale, 165 * yScale), wMessage, BUTTON_MSG_OK, dataManager.GetSysString(1211));
...@@ -570,31 +578,43 @@ bool Game::Initialize(ANDROID_APP app) { ...@@ -570,31 +578,43 @@ bool Game::Initialize(ANDROID_APP app) {
stACMessage->setTextAlignment(irr::gui::EGUIA_CENTER, irr::gui::EGUIA_CENTER); stACMessage->setTextAlignment(irr::gui::EGUIA_CENTER, irr::gui::EGUIA_CENTER);
//yes/no (370) //yes/no (370)
wQuery = env->addWindow(rect<s32>(470 * xScale, 180 * yScale, 860 * xScale, 360 * yScale), false, dataManager.GetSysString(560)); wQuery = env->addWindow(rect<s32>(470 * xScale, 180 * yScale, 860 * xScale, 360 * yScale), false, dataManager.GetSysString(560));
wQuery->setDrawBackground(false);
wQuery->getCloseButton()->setVisible(false); wQuery->getCloseButton()->setVisible(false);
wQuery->setVisible(false); wQuery->setVisible(false);
bgQuery = env->addImage(rect<s32>(0, 0, 390 * xScale, 180 * yScale), wQuery, -1, 0, true);
bgQuery->setImage(imageManager.tDialog_L);
bgQuery->setScaleImage(true);
stQMessage = env->addStaticText(L"", rect<s32>(20 * xScale, 20 * yScale, 390 * xScale, 100 * yScale), false, true, wQuery, -1, false); stQMessage = env->addStaticText(L"", rect<s32>(20 * xScale, 20 * yScale, 390 * xScale, 100 * yScale), false, true, wQuery, -1, false);
stQMessage->setTextAlignment(irr::gui::EGUIA_UPPERLEFT, irr::gui::EGUIA_CENTER); stQMessage->setTextAlignment(irr::gui::EGUIA_UPPERLEFT, irr::gui::EGUIA_CENTER);
btnYes = env->addButton(rect<s32>(80 * xScale, 115 * yScale, 170 * xScale, 165 * yScale), wQuery, BUTTON_YES, dataManager.GetSysString(1213)); btnYes = env->addButton(rect<s32>(80 * xScale, 115 * yScale, 170 * xScale, 165 * yScale), wQuery, BUTTON_YES, dataManager.GetSysString(1213));
btnNo = env->addButton(rect<s32>(200 * xScale, 115 * yScale, 290 * xScale, 165 * yScale), wQuery, BUTTON_NO, dataManager.GetSysString(1214)); btnNo = env->addButton(rect<s32>(200 * xScale, 115 * yScale, 290 * xScale, 165 * yScale), wQuery, BUTTON_NO, dataManager.GetSysString(1214));
//surrender yes/no (310) //surrender yes/no (310)
wSurrender = env->addWindow(rect<s32>(470 * xScale, 180 * yScale, 860 * xScale, 360 * yScale), false, dataManager.GetSysString(560)); wSurrender = env->addWindow(rect<s32>(470 * xScale, 180 * yScale, 860 * xScale, 360 * yScale), false, dataManager.GetSysString(560));
wSurrender->setDrawBackground(false);
wSurrender->getCloseButton()->setVisible(false); wSurrender->getCloseButton()->setVisible(false);
wSurrender->setVisible(false); wSurrender->setVisible(false);
bgSurrender = env->addImage(rect<s32>(0, 0, 390 * xScale, 180 * yScale), wSurrender, -1, 0, true);
bgSurrender->setImage(imageManager.tDialog_L);
bgSurrender->setScaleImage(true);
stSurrenderMessage = env->addStaticText(dataManager.GetSysString(1359), rect<s32>(20 * xScale, 20 * yScale, 350 * xScale, 100 * yScale), false, true, wSurrender, -1, false); stSurrenderMessage = env->addStaticText(dataManager.GetSysString(1359), rect<s32>(20 * xScale, 20 * yScale, 350 * xScale, 100 * yScale), false, true, wSurrender, -1, false);
stSurrenderMessage->setTextAlignment(irr::gui::EGUIA_UPPERLEFT, irr::gui::EGUIA_CENTER); stSurrenderMessage->setTextAlignment(irr::gui::EGUIA_UPPERLEFT, irr::gui::EGUIA_CENTER);
btnSurrenderYes = env->addButton(rect<s32>(80 * xScale, 115 * yScale, 170 * xScale, 165 * yScale), wSurrender, BUTTON_SURRENDER_YES, dataManager.GetSysString(1213)); btnSurrenderYes = env->addButton(rect<s32>(80 * xScale, 115 * yScale, 170 * xScale, 165 * yScale), wSurrender, BUTTON_SURRENDER_YES, dataManager.GetSysString(1213));
btnSurrenderNo = env->addButton(rect<s32>(200 * xScale, 115 * yScale, 290 * xScale, 165 * yScale), wSurrender, BUTTON_SURRENDER_NO, dataManager.GetSysString(1214)); btnSurrenderNo = env->addButton(rect<s32>(200 * xScale, 115 * yScale, 290 * xScale, 165 * yScale), wSurrender, BUTTON_SURRENDER_NO, dataManager.GetSysString(1214));
//options (370) //options (350)
wOptions = env->addWindow(rect<s32>(470 * xScale, 180 * yScale, 860 * xScale, 360 * yScale), false, L""); wOptions = env->addWindow(rect<s32>(470 * xScale, 180 * yScale, 860 * xScale, 360 * yScale), false, L"");
wOptions->setDrawBackground(false);
wOptions->getCloseButton()->setVisible(false); wOptions->getCloseButton()->setVisible(false);
wOptions->setVisible(false); wOptions->setVisible(false);
stOptions = env->addStaticText(L"", rect<s32>(20 * xScale, 20 * yScale, 390 * xScale, 100 * yScale), false, true, wOptions, -1, false); bgOptions = env->addImage(rect<s32>(0, 0, 390 * xScale, 180 * yScale), wOptions, -1, 0, true);
bgOptions->setImage(imageManager.tDialog_L);
bgOptions->setScaleImage(true);
stOptions = env->addStaticText(L"", rect<s32>(20 * xScale, 20 * yScale, 370 * xScale, 100 * yScale), false, true, wOptions, -1, false);
stOptions->setTextAlignment(irr::gui::EGUIA_UPPERLEFT, irr::gui::EGUIA_CENTER); stOptions->setTextAlignment(irr::gui::EGUIA_UPPERLEFT, irr::gui::EGUIA_CENTER);
btnOptionOK = env->addButton(rect<s32>(130 * xScale, 115 * yScale, 260 * xScale, 165 * yScale), wOptions, BUTTON_OPTION_OK, dataManager.GetSysString(1211)); btnOptionOK = env->addButton(rect<s32>(130 * xScale, 115 * yScale, 260 * xScale, 165 * yScale), wOptions, BUTTON_OPTION_OK, dataManager.GetSysString(1211));
btnOptionp = env->addButton(rect<s32>(20 * xScale, 115 * yScale, 100 * xScale, 165 * yScale), wOptions, BUTTON_OPTION_PREV, L"<<<"); btnOptionp = env->addButton(rect<s32>(20 * xScale, 115 * yScale, 100 * xScale, 165 * yScale), wOptions, BUTTON_OPTION_PREV, L"<<<");
btnOptionn = env->addButton(rect<s32>(290 * xScale, 115 * yScale, 370 * xScale, 165 * yScale), wOptions, BUTTON_OPTION_NEXT, L">>>"); btnOptionn = env->addButton(rect<s32>(290 * xScale, 115 * yScale, 370 * xScale, 165 * yScale), wOptions, BUTTON_OPTION_NEXT, L">>>");
for(int i = 0; i < 5; ++i) { for(int i = 0; i < 5; ++i) {
btnOption[i] = env->addButton(rect<s32>(10 * xScale, (30 + 60 * i) * yScale, 380 * xScale, (80 + 60 * i) * yScale), wOptions, BUTTON_OPTION_0 + i, L""); btnOption[i] = env->addButton(rect<s32>(20 * xScale, (20 + 60 * i) * yScale, 370 * xScale, (70 + 60 * i) * yScale), wOptions, BUTTON_OPTION_0 + i, L"");
} }
scrOption = env->addScrollBar(false, rect<s32>(350 * xScale, 30 * yScale, 380 * xScale, 220 * yScale), wOptions, SCROLL_OPTION_SELECT); scrOption = env->addScrollBar(false, rect<s32>(350 * xScale, 30 * yScale, 380 * xScale, 220 * yScale), wOptions, SCROLL_OPTION_SELECT);
scrOption->setLargeStep(1); scrOption->setLargeStep(1);
...@@ -602,26 +622,34 @@ bool Game::Initialize(ANDROID_APP app) { ...@@ -602,26 +622,34 @@ bool Game::Initialize(ANDROID_APP app) {
scrOption->setMin(0); scrOption->setMin(0);
#endif #endif
//pos //pos
wPosSelect = env->addWindow(rect<s32>(340 * xScale, 200 * yScale, 935 * xScale, 410 * yScale), false, dataManager.GetSysString(561)); wPosSelect = env->addWindow(rect<s32>(470 * xScale, 180 * yScale, 860 * xScale, 360 * yScale), false, dataManager.GetSysString(561));
wPosSelect->getCloseButton()->setVisible(false); wPosSelect->getCloseButton()->setVisible(false);
wPosSelect->setDrawBackground(false);
wPosSelect->setVisible(false); wPosSelect->setVisible(false);
btnPSAU = irr::gui::CGUIImageButton::addImageButton(env, rect<s32>(10 * xScale, 45 * yScale, 150 * xScale, 185 * yScale), wPosSelect, BUTTON_POS_AU); bgPosSelect = env->addImage(rect<s32>(0, 0, 390 * xScale, 180 * yScale), wPosSelect, -1, 0, true);
btnPSAU->setImageSize(core::dimension2di(CARD_IMG_WIDTH * 0.5f * xScale, CARD_IMG_HEIGHT * 0.5f * yScale)); bgPosSelect->setImage(imageManager.tDialog_L);
btnPSAD = irr::gui::CGUIImageButton::addImageButton(env, rect<s32>(155 * xScale, 45 * yScale, 295 * xScale, 185 * yScale), wPosSelect, BUTTON_POS_AD); bgPosSelect->setScaleImage(true);
btnPSAD->setImageSize(core::dimension2di(CARD_IMG_WIDTH * 0.5f * xScale, CARD_IMG_HEIGHT * 0.5f * yScale)); btnPSAU = irr::gui::CGUIImageButton::addImageButton(env, rect<s32>(50 * xScale, 25 * yScale, 190 * xScale, 165 * yScale), wPosSelect, BUTTON_POS_AU);
btnPSAU->setImageSize(core::dimension2di(CARD_IMG_WIDTH * 0.5f * yScale, CARD_IMG_HEIGHT * 0.5f * yScale));
btnPSAD = irr::gui::CGUIImageButton::addImageButton(env, rect<s32>(200 * xScale, 25 * yScale, 340 * xScale, 165 * yScale), wPosSelect, BUTTON_POS_AD);
btnPSAD->setImageSize(core::dimension2di(CARD_IMG_WIDTH * 0.5f * yScale, CARD_IMG_HEIGHT * 0.5f * yScale));
btnPSAD->setImage(imageManager.tCover[0]); btnPSAD->setImage(imageManager.tCover[0]);
btnPSDU = irr::gui::CGUIImageButton::addImageButton(env, rect<s32>(300 * xScale, 45 * yScale, 440 * xScale, 185 * yScale), wPosSelect, BUTTON_POS_DU); btnPSDU = irr::gui::CGUIImageButton::addImageButton(env, rect<s32>(50 * xScale, 25 * yScale, 190 * xScale, 165 * yScale), wPosSelect, BUTTON_POS_DU);
btnPSDU->setImageSize(core::dimension2di(CARD_IMG_WIDTH * 0.5f * xScale, CARD_IMG_HEIGHT * 0.5f * yScale)); btnPSDU->setImageSize(core::dimension2di(CARD_IMG_WIDTH * 0.5f * yScale, CARD_IMG_HEIGHT * 0.5f * yScale));
btnPSDU->setImageRotation(270); btnPSDU->setImageRotation(270);
btnPSDD = irr::gui::CGUIImageButton::addImageButton(env, rect<s32>(445 * xScale, 45 * yScale, 585 * xScale, 185 * yScale), wPosSelect, BUTTON_POS_DD); btnPSDD = irr::gui::CGUIImageButton::addImageButton(env, rect<s32>(200 * xScale, 25 * yScale, 340 * xScale, 165 * yScale), wPosSelect, BUTTON_POS_DD);
btnPSDD->setImageSize(core::dimension2di(CARD_IMG_WIDTH * 0.5f * xScale, CARD_IMG_HEIGHT * 0.5f * yScale)); btnPSDD->setImageSize(core::dimension2di(CARD_IMG_WIDTH * 0.5f * yScale, CARD_IMG_HEIGHT * 0.5f * yScale));
btnPSDD->setImageRotation(270); btnPSDD->setImageRotation(270);
btnPSDD->setImage(imageManager.tCover[0]); btnPSDD->setImage(imageManager.tCover[0]);
#ifdef _IRR_ANDROID_PLATFORM_ #ifdef _IRR_ANDROID_PLATFORM_
//card select //card select
wCardSelect = env->addWindow(rect<s32>(320 * xScale, 100 * yScale, 1000 * xScale, 430 * yScale), false, L""); wCardSelect = env->addWindow(rect<s32>(320 * xScale, 100 * yScale, 1000 * xScale, 430 * yScale), false, L"");
wCardSelect->getCloseButton()->setVisible(false); wCardSelect->getCloseButton()->setVisible(false);
wCardSelect->setDrawBackground(false);
wCardSelect->setVisible(false); wCardSelect->setVisible(false);
bgCardSelect = env->addImage(rect<s32>(0, 0, 680 * xScale, 330 * yScale), wCardSelect, -1, 0, true);
bgCardSelect->setImage(imageManager.tDialog_L);
bgCardSelect->setScaleImage(true);
for(int i = 0; i < 5; ++i) { for(int i = 0; i < 5; ++i) {
stCardPos[i] = env->addStaticText(L"", rect<s32>((40 + 125 * i) * xScale, 30 * yScale, (139 + 125 * i) * xScale, 50 * yScale), true, false, wCardSelect, -1, true); stCardPos[i] = env->addStaticText(L"", rect<s32>((40 + 125 * i) * xScale, 30 * yScale, (139 + 125 * i) * xScale, 50 * yScale), true, false, wCardSelect, -1, true);
stCardPos[i]->setBackgroundColor(0xffffffff); stCardPos[i]->setBackgroundColor(0xffffffff);
...@@ -634,7 +662,11 @@ bool Game::Initialize(ANDROID_APP app) { ...@@ -634,7 +662,11 @@ bool Game::Initialize(ANDROID_APP app) {
//card display //card display
wCardDisplay = env->addWindow(rect<s32>(320 * xScale, 100 * yScale, 1000 * xScale, 400 * yScale), false, L""); wCardDisplay = env->addWindow(rect<s32>(320 * xScale, 100 * yScale, 1000 * xScale, 400 * yScale), false, L"");
wCardDisplay->getCloseButton()->setVisible(false); wCardDisplay->getCloseButton()->setVisible(false);
wCardSelect->setDrawBackground(false);
wCardDisplay->setVisible(false); wCardDisplay->setVisible(false);
bgCardDisplay = env->addImage(rect<s32>(0, 0, 680 * xScale, 300 * yScale), wCardDisplay, -1, 0, true);
bgCardDisplay->setImage(imageManager.tDialog_L);
bgCardDisplay->setScaleImage(true);
for(int i = 0; i < 5; ++i) { for(int i = 0; i < 5; ++i) {
stDisplayPos[i] = env->addStaticText(L"", rect<s32>((30 + 125 * i) *xScale, 30 * yScale, (150 + 125 * i) * xScale, 50 * yScale), true, false, wCardDisplay, -1, true); stDisplayPos[i] = env->addStaticText(L"", rect<s32>((30 + 125 * i) *xScale, 30 * yScale, (150 + 125 * i) * xScale, 50 * yScale), true, false, wCardDisplay, -1, true);
stDisplayPos[i]->setBackgroundColor(0xffffffff); stDisplayPos[i]->setBackgroundColor(0xffffffff);
...@@ -929,16 +961,19 @@ bool Game::Initialize(ANDROID_APP app) { ...@@ -929,16 +961,19 @@ bool Game::Initialize(ANDROID_APP app) {
lstSinglePlayList->setItemHeight(25 * yScale); lstSinglePlayList->setItemHeight(25 * yScale);
btnLoadSinglePlay = env->addButton(rect<s32>(420 * xScale, 240 * yScale, 530 * xScale, 280 * yScale), tabSingle, BUTTON_LOAD_SINGLEPLAY, dataManager.GetSysString(1211)); btnLoadSinglePlay = env->addButton(rect<s32>(420 * xScale, 240 * yScale, 530 * xScale, 280 * yScale), tabSingle, BUTTON_LOAD_SINGLEPLAY, dataManager.GetSysString(1211));
btnSinglePlayCancel = env->addButton(rect<s32>(420 * xScale, 290 * yScale, 530 * xScale, 330 * yScale),tabSingle, BUTTON_CANCEL_SINGLEPLAY, dataManager.GetSysString(1210)); btnSinglePlayCancel = env->addButton(rect<s32>(420 * xScale, 290 * yScale, 530 * xScale, 330 * yScale),tabSingle, BUTTON_CANCEL_SINGLEPLAY, dataManager.GetSysString(1210));
//replay save //replay save
wReplaySave = env->addWindow(rect<s32>(490 * xScale, 180 * yScale, 840 * xScale, 340 * yScale), false, dataManager.GetSysString(1340)); wReplaySave = env->addWindow(rect<s32>(470 * xScale, 180 * yScale, 860 * xScale, 360 * yScale), false, dataManager.GetSysString(1340));
wReplaySave->setDrawBackground(false);
wReplaySave->getCloseButton()->setVisible(false); wReplaySave->getCloseButton()->setVisible(false);
wReplaySave->setVisible(false); wReplaySave->setVisible(false);
bgReplaySave = env->addImage(rect<s32>(0, 0, 390 * xScale, 180 * yScale), wReplaySave, -1, 0, true);
bgReplaySave->setImage(imageManager.tDialog_L);
bgReplaySave->setScaleImage(true);
env->addStaticText(dataManager.GetSysString(1342), rect<s32>(20 * xScale, 25 * yScale, 290 * xScale, 45 * yScale), false, false, wReplaySave); env->addStaticText(dataManager.GetSysString(1342), rect<s32>(20 * xScale, 25 * yScale, 290 * xScale, 45 * yScale), false, false, wReplaySave);
ebRSName = CAndroidGUIEditBox::addAndroidEditBox(L"", true, env, rect<s32>(20 * xScale, 50 * yScale, 330 * xScale, 90 * yScale), wReplaySave, -1); ebRSName = CAndroidGUIEditBox::addAndroidEditBox(L"", true, env, rect<s32>(20 * xScale, 50 * yScale, 370 * xScale, 90 * yScale), wReplaySave, -1);
ebRSName->setTextAlignment(irr::gui::EGUIA_CENTER, irr::gui::EGUIA_CENTER); ebRSName->setTextAlignment(irr::gui::EGUIA_CENTER, irr::gui::EGUIA_CENTER);
btnRSYes = env->addButton(rect<s32>(70 * xScale, 100 * yScale, 160 * xScale, 150 * yScale), wReplaySave, BUTTON_REPLAY_SAVE, dataManager.GetSysString(1341)); btnRSYes = env->addButton(rect<s32>(70 * xScale, 110 * yScale, 180 * xScale, 160 * yScale), wReplaySave, BUTTON_REPLAY_SAVE, dataManager.GetSysString(1341));
btnRSNo = env->addButton(rect<s32>(180 * xScale, 100 * yScale, 270 * xScale, 150 * yScale), wReplaySave, BUTTON_REPLAY_CANCEL, dataManager.GetSysString(1212)); btnRSNo = env->addButton(rect<s32>(210 * xScale, 110 * yScale, 320 * xScale, 160 * yScale), wReplaySave, BUTTON_REPLAY_CANCEL, dataManager.GetSysString(1212));
//replay control //replay control
wReplayControl = env->addStaticText(L"", rect<s32>(200 * yScale, 43 * yScale, 305 * yScale, 273 * yScale), true, false, 0, -1, true); wReplayControl = env->addStaticText(L"", rect<s32>(200 * yScale, 43 * yScale, 305 * yScale, 273 * yScale), true, false, 0, -1, true);
wReplayControl->setVisible(false); wReplayControl->setVisible(false);
...@@ -1831,5 +1866,8 @@ int Game::LocalPlayer(int player) { ...@@ -1831,5 +1866,8 @@ int Game::LocalPlayer(int player) {
const wchar_t* Game::LocalName(int local_player) { const wchar_t* Game::LocalName(int local_player) {
return local_player == 0 ? dInfo.hostname : dInfo.clientname; return local_player == 0 ? dInfo.hostname : dInfo.clientname;
} }
void Game::AddIGUIImageBUtton(irr::gui::IGUIButton* button) {
}
} }
Classes/gframe/game.h
View file @ 85467daa
...@@ -169,6 +169,7 @@ public: ...@@ -169,6 +169,7 @@ public:
void CloseGameButtons(); void CloseGameButtons();
void CloseGameWindow(); void CloseGameWindow();
void CloseDuelWindow(); void CloseDuelWindow();
void AddIGUIImageBUtton(irr::gui::IGUIButton* button);
int LocalPlayer(int player); int LocalPlayer(int player);
const wchar_t* LocalName(int local_player); const wchar_t* LocalName(int local_player);
...@@ -399,10 +400,12 @@ public: ...@@ -399,10 +400,12 @@ public:
irr::gui::CGUIImageButton* btnHand[3]; irr::gui::CGUIImageButton* btnHand[3];
// //
irr::gui::IGUIWindow* wFTSelect; irr::gui::IGUIWindow* wFTSelect;
irr::gui::IGUIImage* bgFTSelect;
irr::gui::IGUIButton* btnFirst; irr::gui::IGUIButton* btnFirst;
irr::gui::IGUIButton* btnSecond; irr::gui::IGUIButton* btnSecond;
//message //message
irr::gui::IGUIWindow* wMessage; irr::gui::IGUIWindow* wMessage;
irr::gui::IGUIImage* bgMessage;
irr::gui::IGUIStaticText* stMessage; irr::gui::IGUIStaticText* stMessage;
irr::gui::IGUIButton* btnMsgOK; irr::gui::IGUIButton* btnMsgOK;
//auto close message //auto close message
...@@ -410,16 +413,19 @@ public: ...@@ -410,16 +413,19 @@ public:
irr::gui::IGUIStaticText* stACMessage; irr::gui::IGUIStaticText* stACMessage;
//yes/no //yes/no
irr::gui::IGUIWindow* wQuery; irr::gui::IGUIWindow* wQuery;
irr::gui::IGUIImage* bgQuery;
irr::gui::IGUIStaticText* stQMessage; irr::gui::IGUIStaticText* stQMessage;
irr::gui::IGUIButton* btnYes; irr::gui::IGUIButton* btnYes;
irr::gui::IGUIButton* btnNo; irr::gui::IGUIButton* btnNo;
//surrender yes/no //surrender yes/no
irr::gui::IGUIWindow* wSurrender; irr::gui::IGUIWindow* wSurrender;
irr::gui::IGUIImage* bgSurrender;
irr::gui::IGUIStaticText* stSurrenderMessage; irr::gui::IGUIStaticText* stSurrenderMessage;
irr::gui::IGUIButton* btnSurrenderYes; irr::gui::IGUIButton* btnSurrenderYes;
irr::gui::IGUIButton* btnSurrenderNo; irr::gui::IGUIButton* btnSurrenderNo;
//options //options
irr::gui::IGUIWindow* wOptions; irr::gui::IGUIWindow* wOptions;
irr::gui::IGUIImage* bgOptions;
irr::gui::IGUIStaticText* stOptions; irr::gui::IGUIStaticText* stOptions;
irr::gui::IGUIButton* btnOptionp; irr::gui::IGUIButton* btnOptionp;
irr::gui::IGUIButton* btnOptionn; irr::gui::IGUIButton* btnOptionn;
...@@ -428,18 +434,21 @@ public: ...@@ -428,18 +434,21 @@ public:
irr::gui::IGUIScrollBar* scrOption; irr::gui::IGUIScrollBar* scrOption;
//pos selection //pos selection
irr::gui::IGUIWindow* wPosSelect; irr::gui::IGUIWindow* wPosSelect;
irr::gui::IGUIImage* bgPosSelect;
irr::gui::CGUIImageButton* btnPSAU; irr::gui::CGUIImageButton* btnPSAU;
irr::gui::CGUIImageButton* btnPSAD; irr::gui::CGUIImageButton* btnPSAD;
irr::gui::CGUIImageButton* btnPSDU; irr::gui::CGUIImageButton* btnPSDU;
irr::gui::CGUIImageButton* btnPSDD; irr::gui::CGUIImageButton* btnPSDD;
//card selection //card selection
irr::gui::IGUIWindow* wCardSelect; irr::gui::IGUIWindow* wCardSelect;
irr::gui::IGUIImage* bgCardSelect;
irr::gui::CGUIImageButton* btnCardSelect[5]; irr::gui::CGUIImageButton* btnCardSelect[5];
irr::gui::IGUIStaticText *stCardPos[5]; irr::gui::IGUIStaticText *stCardPos[5];
irr::gui::IGUIScrollBar *scrCardList; irr::gui::IGUIScrollBar *scrCardList;
irr::gui::IGUIButton* btnSelectOK; irr::gui::IGUIButton* btnSelectOK;
//card display //card display
irr::gui::IGUIWindow* wCardDisplay; irr::gui::IGUIWindow* wCardDisplay;
irr::gui::IGUIImage* bgCardDisplay;
irr::gui::CGUIImageButton* btnCardDisplay[5]; irr::gui::CGUIImageButton* btnCardDisplay[5];
irr::gui::IGUIStaticText *stDisplayPos[5]; irr::gui::IGUIStaticText *stDisplayPos[5];
irr::gui::IGUIScrollBar *scrDisplayList; irr::gui::IGUIScrollBar *scrDisplayList;
...@@ -561,6 +570,7 @@ public: ...@@ -561,6 +570,7 @@ public:
irr::gui::IGUIComboBox* cbSortType; irr::gui::IGUIComboBox* cbSortType;
//replay save //replay save
irr::gui::IGUIWindow* wReplaySave; irr::gui::IGUIWindow* wReplaySave;
irr::gui::IGUIImage* bgReplaySave;
irr::gui::IGUIEditBox* ebRSName; irr::gui::IGUIEditBox* ebRSName;
irr::gui::IGUIButton* btnRSYes; irr::gui::IGUIButton* btnRSYes;
irr::gui::IGUIButton* btnRSNo; irr::gui::IGUIButton* btnRSNo;
......
Classes/gframe/image_manager.cpp
View file @ 85467daa
...@@ -43,6 +43,8 @@ bool ImageManager::Initial(const path dir) { ...@@ -43,6 +43,8 @@ bool ImageManager::Initial(const path dir) {
tShut = driver->getTexture((dir + path("/textures/extra/tshut.png")).c_str()); tShut = driver->getTexture((dir + path("/textures/extra/tshut.png")).c_str());
tTitleBar = driver->getTexture((dir + path("/textures/extra/stitlebar.png")).c_str()); tTitleBar = driver->getTexture((dir + path("/textures/extra/stitlebar.png")).c_str());
tWindow = driver->getTexture((dir + path("/textures/extra/sWindow.png")).c_str()); tWindow = driver->getTexture((dir + path("/textures/extra/sWindow.png")).c_str());
tDialog_S = driver->getTexture((dir + path("/textures/extra/sDialog_S.png")).c_str());
tDialog_L = driver->getTexture((dir + path("/textures/extra/sDialog_L.png")).c_str());
if(!tBackGround_menu) if(!tBackGround_menu)
tBackGround_menu = tBackGround; tBackGround_menu = tBackGround;
tBackGround_deck = driver->getTexture((dir + path("/textures/bg_deck.jpg")).c_str()); tBackGround_deck = driver->getTexture((dir + path("/textures/bg_deck.jpg")).c_str());
......
Classes/gframe/image_manager.h
View file @ 85467daa
...@@ -65,6 +65,10 @@ public: ...@@ -65,6 +65,10 @@ public:
irr::video::ITexture* tShut; irr::video::ITexture* tShut;
irr::video::ITexture* tTitleBar; irr::video::ITexture* tTitleBar;
irr::video::ITexture* tWindow; irr::video::ITexture* tWindow;
irr::video::ITexture* tDialog_L;
irr::video::ITexture* tDialog_S;
irr::video::ITexture* tButton_L;
irr::video::ITexture* tButton_S;
std::list<std::string> support_types; std::list<std::string> support_types;
}; };
......
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