Skip to content

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

卡组管理调整布局 

增加卡组管理贴图
调整列表行间距
parent c1bc1206
Hide whitespace changes
Inline Side-by-side
Showing with 43 additions and 44 deletions
Classes/gframe/game.cpp
View file @ efa665ba
...@@ -257,7 +257,7 @@ bool Game::Initialize(ANDROID_APP app) { ...@@ -257,7 +257,7 @@ bool Game::Initialize(ANDROID_APP app) {
ebNickName = CAndroidGUIEditBox::addAndroidEditBox(gameConf.nickname, true, env, rect<s32>(110 * xScale, 25 * yScale, 420 * xScale, 65 * yScale), wLanWindow); ebNickName = CAndroidGUIEditBox::addAndroidEditBox(gameConf.nickname, true, env, rect<s32>(110 * xScale, 25 * yScale, 420 * xScale, 65 * yScale), wLanWindow);
ebNickName->setTextAlignment(irr::gui::EGUIA_CENTER, irr::gui::EGUIA_CENTER); ebNickName->setTextAlignment(irr::gui::EGUIA_CENTER, irr::gui::EGUIA_CENTER);
lstHostList = env->addListBox(rect<s32>(30 * xScale, 75 * yScale, 540 * xScale, 240 * yScale), wLanWindow, LISTBOX_LAN_HOST, true); lstHostList = env->addListBox(rect<s32>(30 * xScale, 75 * yScale, 540 * xScale, 240 * yScale), wLanWindow, LISTBOX_LAN_HOST, true);
lstHostList->setItemHeight(25 * yScale); lstHostList->setItemHeight(30 * yScale);
btnLanRefresh = env->addButton(rect<s32>(205 * xScale, 250 * yScale, 315 * xScale, 290 * yScale), wLanWindow, BUTTON_LAN_REFRESH, dataManager.GetSysString(1217)); btnLanRefresh = env->addButton(rect<s32>(205 * xScale, 250 * yScale, 315 * xScale, 290 * yScale), wLanWindow, BUTTON_LAN_REFRESH, dataManager.GetSysString(1217));
ChangeToIGUIImageButton(btnLanRefresh, imageManager.tButton_S, imageManager.tButton_S_pressed); ChangeToIGUIImageButton(btnLanRefresh, imageManager.tButton_S, imageManager.tButton_S_pressed);
env->addStaticText(dataManager.GetSysString(1221), rect<s32>(30 * xScale, 305 * yScale, 100 * xScale, 340 * yScale), false, false, wLanWindow); env->addStaticText(dataManager.GetSysString(1221), rect<s32>(30 * xScale, 305 * yScale, 100 * xScale, 340 * yScale), false, false, wLanWindow);
...@@ -446,7 +446,7 @@ bool Game::Initialize(ANDROID_APP app) { ...@@ -446,7 +446,7 @@ bool Game::Initialize(ANDROID_APP app) {
wLogs->setVisible(false); wLogs->setVisible(false);
ChangeToIGUIImageWindow(wLogs, bgLogs, imageManager.tDialog_S); ChangeToIGUIImageWindow(wLogs, bgLogs, imageManager.tDialog_S);
lstLog = env->addListBox(rect<s32>(10 * xScale, 20 * yScale, 290 * xScale, 440 * yScale), wLogs, LISTBOX_LOG, false); lstLog = env->addListBox(rect<s32>(10 * xScale, 20 * yScale, 290 * xScale, 440 * yScale), wLogs, LISTBOX_LOG, false);
lstLog->setItemHeight(25 * yScale); lstLog->setItemHeight(30 * yScale);
btnClearLog = env->addButton(rect<s32>(20 * xScale, 450 * yScale, 130 * xScale, 490 * yScale), wLogs, BUTTON_CLEAR_LOG, dataManager.GetSysString(1304)); btnClearLog = env->addButton(rect<s32>(20 * xScale, 450 * yScale, 130 * xScale, 490 * yScale), wLogs, BUTTON_CLEAR_LOG, dataManager.GetSysString(1304));
ChangeToIGUIImageButton(btnClearLog, imageManager.tButton_S, imageManager.tButton_S_pressed); ChangeToIGUIImageButton(btnClearLog, imageManager.tButton_S, imageManager.tButton_S_pressed);
btnCloseLog = env->addButton(rect<s32>(170 * xScale, 450 * yScale, 280 * xScale, 490 * yScale), wLogs, BUTTON_CLOSE_LOG, dataManager.GetSysString(1211)); btnCloseLog = env->addButton(rect<s32>(170 * xScale, 450 * yScale, 280 * xScale, 490 * yScale), wLogs, BUTTON_CLOSE_LOG, dataManager.GetSysString(1211));
...@@ -771,32 +771,31 @@ bool Game::Initialize(ANDROID_APP app) { ...@@ -771,32 +771,31 @@ bool Game::Initialize(ANDROID_APP app) {
wDeckManage->setVisible(false); wDeckManage->setVisible(false);
wDeckManage->getCloseButton()->setVisible(false); wDeckManage->getCloseButton()->setVisible(false);
ChangeToIGUIImageWindow(wDeckManage, bgDeckManage, imageManager.tWindow_V); ChangeToIGUIImageWindow(wDeckManage, bgDeckManage, imageManager.tWindow_V);
lstCategories = env->addListBox(rect<s32>(20 * xScale, 30 * yScale, 100 * xScale, 510 * yScale), wDeckManage, LISTBOX_CATEGORIES, true); lstCategories = env->addListBox(rect<s32>(20 * xScale, 20 * yScale, 110 * xScale, 520 * yScale), wDeckManage, LISTBOX_CATEGORIES, true);
lstCategories->setItemHeight(25 * yScale); lstCategories->setItemHeight(30 * yScale);
lstDecks = env->addListBox(rect<s32>(110 * xScale, 30 * yScale, 240 * xScale, 510 * yScale), wDeckManage, LISTBOX_DECKS, true); lstDecks = env->addListBox(rect<s32>(115 * xScale, 20 * yScale, 280 * xScale, 520 * yScale), wDeckManage, LISTBOX_DECKS, true);
lstCategories->setItemHeight(25 * yScale); lstCategories->setItemHeight(30 * yScale);
posY = 30 * yScale; btnNewCategory = env->addButton(rect<s32>(290 * xScale, 20 * yScale, 370 * xScale, 60 * yScale), wDeckManage, BUTTON_NEW_CATEGORY, dataManager.GetSysString(1461));
btnNewCategory = env->addButton(rect<s32>(250 * xScale, posY * yScale, 360 * xScale, posY + 40 * yScale), wDeckManage, BUTTON_NEW_CATEGORY, dataManager.GetSysString(1461)); ChangeToIGUIImageButton(btnNewCategory, imageManager.tButton_S, imageManager.tButton_S_pressed);
posY += 50 * yScale; btnRenameCategory = env->addButton(rect<s32>(290 * xScale, 65 * yScale, 370 * xScale, 105 * yScale), wDeckManage, BUTTON_RENAME_CATEGORY, dataManager.GetSysString(1462));
btnRenameCategory = env->addButton(rect<s32>(250 * xScale, posY * yScale, 360 * xScale, posY + 40 * yScale), wDeckManage, BUTTON_RENAME_CATEGORY, dataManager.GetSysString(1462)); ChangeToIGUIImageButton(btnRenameCategory, imageManager.tButton_S, imageManager.tButton_S_pressed);
posY += 50 * yScale; btnDeleteCategory = env->addButton(rect<s32>(290 * xScale, 110 * yScale, 370 * xScale, 150 * yScale), wDeckManage, BUTTON_DELETE_CATEGORY, dataManager.GetSysString(1463));
btnDeleteCategory = env->addButton(rect<s32>(250 * xScale, posY * yScale, 360 * xScale, posY + 40 * yScale), wDeckManage, BUTTON_DELETE_CATEGORY, dataManager.GetSysString(1463)); ChangeToIGUIImageButton(btnDeleteCategory, imageManager.tButton_S, imageManager.tButton_S_pressed);
posY += 50 * yScale; btnNewDeck = env->addButton(rect<s32>(290 * xScale, 155 * yScale, 370 * xScale, 195 * yScale), wDeckManage, BUTTON_NEW_DECK, dataManager.GetSysString(1464));
btnNewDeck = env->addButton(rect<s32>(250 * xScale, posY * yScale, 360 * xScale, posY + 40 * yScale), wDeckManage, BUTTON_NEW_DECK, dataManager.GetSysString(1464)); ChangeToIGUIImageButton(btnNewDeck, imageManager.tButton_S, imageManager.tButton_S_pressed);
posY += 50 * yScale; btnRenameDeck = env->addButton(rect<s32>(290 * xScale, 200 * yScale, 370 * xScale, 240 * yScale), wDeckManage, BUTTON_RENAME_DECK, dataManager.GetSysString(1465));
btnRenameDeck = env->addButton(rect<s32>(250 * xScale, posY * yScale, 360 * xScale, posY + 40 * yScale), wDeckManage, BUTTON_RENAME_DECK, dataManager.GetSysString(1465)); ChangeToIGUIImageButton(btnRenameDeck, imageManager.tButton_S, imageManager.tButton_S_pressed);
posY += 50 * yScale; btnDMDeleteDeck = env->addButton(rect<s32>(290 * xScale, 245 * yScale, 370 * xScale, 285 * yScale), wDeckManage, BUTTON_DELETE_DECK_DM, dataManager.GetSysString(1466));
btnDMDeleteDeck = env->addButton(rect<s32>(250 * xScale, posY * yScale, 360 * xScale, posY + 40 * yScale), wDeckManage, BUTTON_DELETE_DECK_DM, dataManager.GetSysString(1466)); ChangeToIGUIImageButton(btnDMDeleteDeck, imageManager.tButton_S, imageManager.tButton_S_pressed);
posY += 50 * yScale; btnMoveDeck = env->addButton(rect<s32>(290 * xScale, 290 * yScale, 370 * xScale, 330 * yScale), wDeckManage, BUTTON_MOVE_DECK, dataManager.GetSysString(1467));
btnMoveDeck = env->addButton(rect<s32>(250 * xScale, posY * yScale, 360 * xScale, posY + 40 * yScale), wDeckManage, BUTTON_MOVE_DECK, dataManager.GetSysString(1467)); ChangeToIGUIImageButton(btnMoveDeck, imageManager.tButton_S, imageManager.tButton_S_pressed);
posY += 50 * yScale; btnCopyDeck = env->addButton(rect<s32>(290 * xScale, 335 * yScale, 370 * xScale, 375 * yScale), wDeckManage, BUTTON_COPY_DECK, dataManager.GetSysString(1468));
btnCopyDeck = env->addButton(rect<s32>(250 * xScale, posY * yScale, 360 * xScale, posY + 40 * yScale), wDeckManage, BUTTON_COPY_DECK, dataManager.GetSysString(1468)); ChangeToIGUIImageButton(btnCopyDeck, imageManager.tButton_S, imageManager.tButton_S_pressed);
posY += 50 * yScale; cbLFList = CAndroidGUIComboBox::addAndroidComboBox(env, rect<s32>(290 * xScale, 435 * yScale, 370 * xScale, 475 * yScale), wDeckManage, COMBOBOX_LFLIST);
cbLFList = CAndroidGUIComboBox::addAndroidComboBox(env, rect<s32>(250 * xScale, posY * yScale, 360 * xScale, posY + 40 * yScale), wDeckManage, COMBOBOX_LFLIST);
for(unsigned int i = 0; i < deckManager._lfList.size(); ++i) for(unsigned int i = 0; i < deckManager._lfList.size(); ++i)
cbLFList->addItem(deckManager._lfList[i].listName); cbLFList->addItem(deckManager._lfList[i].listName);
posY += 50 * yScale; btnCloseDM = env->addButton(rect<s32>(290 * xScale, 480 * yScale, 370 * xScale, 520 * yScale), wDeckManage, BUTTON_CLOSE_DECKMANAGER, dataManager.GetSysString(1211));
btnCloseDM = env->addButton(rect<s32>(250 * xScale, posY * yScale, 360 * xScale, posY + 40 * yScale), wDeckManage, BUTTON_CLOSE_DECKMANAGER, dataManager.GetSysString(1211)); ChangeToIGUIImageButton(btnCloseDM, imageManager.tButton_S, imageManager.tButton_S_pressed);
//deck manage query //deck manage query
wDMQuery = env->addWindow(rect<s32>(490 * xScale, 180 * yScale, 840 * xScale, 340 * yScale), false, dataManager.GetSysString(1460)); wDMQuery = env->addWindow(rect<s32>(490 * xScale, 180 * yScale, 840 * xScale, 340 * yScale), false, dataManager.GetSysString(1460));
wDMQuery->getCloseButton()->setVisible(false); wDMQuery->getCloseButton()->setVisible(false);
...@@ -962,7 +961,7 @@ bool Game::Initialize(ANDROID_APP app) { ...@@ -962,7 +961,7 @@ bool Game::Initialize(ANDROID_APP app) {
bgReplay->setImage(imageManager.tWindow); bgReplay->setImage(imageManager.tWindow);
bgReplay->setScaleImage(true); bgReplay->setScaleImage(true);
lstReplayList = env->addListBox(rect<s32>(20 * xScale, 30 * yScale, 310 * xScale, 400 * yScale), wReplay, LISTBOX_REPLAY_LIST, true); lstReplayList = env->addListBox(rect<s32>(20 * xScale, 30 * yScale, 310 * xScale, 400 * yScale), wReplay, LISTBOX_REPLAY_LIST, true);
lstReplayList->setItemHeight(25 * yScale); lstReplayList->setItemHeight(30 * yScale);
btnLoadReplay = env->addButton(rect<s32>(440 * xScale, 310 * yScale, 550 * xScale, 350 * yScale), wReplay, BUTTON_LOAD_REPLAY, dataManager.GetSysString(1348)); btnLoadReplay = env->addButton(rect<s32>(440 * xScale, 310 * yScale, 550 * xScale, 350 * yScale), wReplay, BUTTON_LOAD_REPLAY, dataManager.GetSysString(1348));
ChangeToIGUIImageButton(btnLoadReplay, imageManager.tButton_S, imageManager.tButton_S_pressed); ChangeToIGUIImageButton(btnLoadReplay, imageManager.tButton_S, imageManager.tButton_S_pressed);
btnDeleteReplay = env->addButton(rect<s32>(320 * xScale, 310 * yScale, 430 * xScale, 350 * yScale), wReplay, BUTTON_DELETE_REPLAY, dataManager.GetSysString(1361)); btnDeleteReplay = env->addButton(rect<s32>(320 * xScale, 310 * yScale, 430 * xScale, 350 * yScale), wReplay, BUTTON_DELETE_REPLAY, dataManager.GetSysString(1361));
...@@ -992,7 +991,7 @@ bool Game::Initialize(ANDROID_APP app) { ...@@ -992,7 +991,7 @@ bool Game::Initialize(ANDROID_APP app) {
if(gameConf.enable_bot_mode) { if(gameConf.enable_bot_mode) {
irr::gui::IGUITab* tabBot = wSingle->addTab(dataManager.GetSysString(1380)); irr::gui::IGUITab* tabBot = wSingle->addTab(dataManager.GetSysString(1380));
lstBotList = env->addListBox(rect<s32>(0, 0, 300 * xScale, 330 * yScale), tabBot, LISTBOX_BOT_LIST, true); lstBotList = env->addListBox(rect<s32>(0, 0, 300 * xScale, 330 * yScale), tabBot, LISTBOX_BOT_LIST, true);
lstBotList->setItemHeight(25 * yScale); lstBotList->setItemHeight(30 * yScale);
btnStartBot = env->addButton(rect<s32>(420 * xScale, 240 * yScale, 530 * xScale, 280 * yScale), tabBot, BUTTON_BOT_START, dataManager.GetSysString(1211)); btnStartBot = env->addButton(rect<s32>(420 * xScale, 240 * yScale, 530 * xScale, 280 * yScale), tabBot, BUTTON_BOT_START, dataManager.GetSysString(1211));
ChangeToIGUIImageButton(btnStartBot, imageManager.tButton_S, imageManager.tButton_S_pressed); ChangeToIGUIImageButton(btnStartBot, imageManager.tButton_S, imageManager.tButton_S_pressed);
btnBotCancel = env->addButton(rect<s32>(420 * xScale, 290 * yScale, 530 * xScale, 330 * yScale), tabBot, BUTTON_CANCEL_SINGLEPLAY, dataManager.GetSysString(1210)); btnBotCancel = env->addButton(rect<s32>(420 * xScale, 290 * yScale, 530 * xScale, 330 * yScale), tabBot, BUTTON_CANCEL_SINGLEPLAY, dataManager.GetSysString(1210));
...@@ -1018,7 +1017,7 @@ bool Game::Initialize(ANDROID_APP app) { ...@@ -1018,7 +1017,7 @@ bool Game::Initialize(ANDROID_APP app) {
env->addStaticText(dataManager.GetSysString(1352), rect<s32>(310 * xScale, 10 * yScale, 500 * xScale, 30 * yScale), false, true, tabSingle); env->addStaticText(dataManager.GetSysString(1352), rect<s32>(310 * xScale, 10 * yScale, 500 * xScale, 30 * yScale), false, true, tabSingle);
stSinglePlayInfo = env->addStaticText(L"", rect<s32>(310 * xScale, 40 * yScale, 560 * xScale, 80 * yScale), false, true, tabSingle); stSinglePlayInfo = env->addStaticText(L"", rect<s32>(310 * xScale, 40 * yScale, 560 * xScale, 80 * yScale), false, true, tabSingle);
lstSinglePlayList = env->addListBox(rect<s32>(0, 0, 300 * xScale, 330 * yScale), tabSingle, LISTBOX_SINGLEPLAY_LIST, true); lstSinglePlayList = env->addListBox(rect<s32>(0, 0, 300 * xScale, 330 * yScale), tabSingle, LISTBOX_SINGLEPLAY_LIST, true);
lstSinglePlayList->setItemHeight(25 * yScale); lstSinglePlayList->setItemHeight(30 * 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));
ChangeToIGUIImageButton(btnLoadSinglePlay, imageManager.tButton_S, imageManager.tButton_S_pressed); ChangeToIGUIImageButton(btnLoadSinglePlay, imageManager.tButton_S, imageManager.tButton_S_pressed);
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));
......
Classes/gframe/game.h
View file @ efa665ba
...@@ -507,12 +507,12 @@ public: ...@@ -507,12 +507,12 @@ public:
irr::gui::IGUIComboBox* cbDBCategory; irr::gui::IGUIComboBox* cbDBCategory;
irr::gui::IGUIComboBox* cbDBDecks; irr::gui::IGUIComboBox* cbDBDecks;
irr::gui::IGUIButton* btnManageDeck;// irr::gui::IGUIButton* btnManageDeck;//
irr::gui::IGUIButton* btnClearDeck; irr::gui::IGUIButton* btnClearDeck;//
irr::gui::IGUIButton* btnSortDeck; irr::gui::IGUIButton* btnSortDeck;
irr::gui::IGUIButton* btnShuffleDeck; irr::gui::IGUIButton* btnShuffleDeck;//
irr::gui::IGUIButton* btnSaveDeck; irr::gui::IGUIButton* btnSaveDeck;
irr::gui::IGUIButton* btnDeleteDeck; irr::gui::IGUIButton* btnDeleteDeck;//
irr::gui::IGUIButton* btnSaveDeckAs; irr::gui::IGUIButton* btnSaveDeckAs;//
irr::gui::IGUIButton* btnSideOK; irr::gui::IGUIButton* btnSideOK;
irr::gui::IGUIButton* btnSideShuffle; irr::gui::IGUIButton* btnSideShuffle;
irr::gui::IGUIButton* btnSideSort; irr::gui::IGUIButton* btnSideSort;
...@@ -534,23 +534,23 @@ public: ...@@ -534,23 +534,23 @@ public:
irr::gui::IGUIImage* bgDeckManage; irr::gui::IGUIImage* bgDeckManage;
irr::gui::IGUIListBox* lstCategories; irr::gui::IGUIListBox* lstCategories;
irr::gui::IGUIListBox* lstDecks; irr::gui::IGUIListBox* lstDecks;
irr::gui::IGUIButton* btnNewCategory; irr::gui::IGUIButton* btnNewCategory;//
irr::gui::IGUIButton* btnRenameCategory; irr::gui::IGUIButton* btnRenameCategory;//
irr::gui::IGUIButton* btnDeleteCategory; irr::gui::IGUIButton* btnDeleteCategory;//
irr::gui::IGUIButton* btnNewDeck; irr::gui::IGUIButton* btnNewDeck;//
irr::gui::IGUIButton* btnRenameDeck; irr::gui::IGUIButton* btnRenameDeck;//
irr::gui::IGUIButton* btnDMDeleteDeck; irr::gui::IGUIButton* btnDMDeleteDeck;//
irr::gui::IGUIButton* btnMoveDeck; irr::gui::IGUIButton* btnMoveDeck;//
irr::gui::IGUIButton* btnCopyDeck; irr::gui::IGUIButton* btnCopyDeck;//
irr::gui::IGUIButton* btnCloseDM; irr::gui::IGUIButton* btnCloseDM;//
irr::gui::IGUIWindow* wDMQuery; irr::gui::IGUIWindow* wDMQuery;
irr::gui::IGUIImage* bgDMQuery; irr::gui::IGUIImage* bgDMQuery;
irr::gui::IGUIStaticText* stDMMessage; irr::gui::IGUIStaticText* stDMMessage;
irr::gui::IGUIStaticText* stDMMessage2; irr::gui::IGUIStaticText* stDMMessage2;
irr::gui::IGUIEditBox* ebDMName; irr::gui::IGUIEditBox* ebDMName;
irr::gui::IGUIComboBox* cbDMCategory; irr::gui::IGUIComboBox* cbDMCategory;
irr::gui::IGUIButton* btnDMOK; irr::gui::IGUIButton* btnDMOK;//
irr::gui::IGUIButton* btnDMCancel; irr::gui::IGUIButton* btnDMCancel;//
irr::gui::IGUIComboBox* cbLFList; irr::gui::IGUIComboBox* cbLFList;
//filter //filter
irr::gui::IGUIWindow* wFilter; irr::gui::IGUIWindow* wFilter;
......
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