增加window_V

Classes/gframe/game.cpp

@@ -380,8 +380,9 @@ bool Game::Initialize(ANDROID_APP app) {
 		ChangeToIGUIImageButton(btnHostPrepCancel, imageManager.tButton_S, imageManager.tButton_S_pressed);
 #endif
 	//img always use *yScale to keep proportion
-	wCardImg = env->addStaticText(L"", rect<s32>(1 * yScale, 1 * yScale, ( 1 + CARD_IMG_WIDTH + 20) * yScale, (1 + CARD_IMG_HEIGHT + 18) * yScale), true, false, 0, -1, true);
-	wCardImg->setBackgroundColor(0x6011113d);
+	wCardImg = env->addImage(rect<s32>(1 * yScale, 1 * yScale, ( 1 + CARD_IMG_WIDTH + 20) * yScale, (1 + CARD_IMG_HEIGHT + 18) * yScale), 0, -1, 0, true);
+	wCardImg->setImage(imageManager.tDialog_S);
+	wCardImg->setScaleImage(true);
 	wCardImg->setVisible(false);
 	imgCard = env->addImage(rect<s32>(10 * yScale, 9 * yScale, (10 + CARD_IMG_WIDTH) * yScale, (9 + CARD_IMG_HEIGHT) * yScale), wCardImg);
 	imgCard->setImage(imageManager.tCover[0]);
@@ -392,20 +393,26 @@ bool Game::Initialize(ANDROID_APP app) {
 	wPhase = env->addStaticText(L"", rect<s32>(480 * xScale, 305 * yScale, 895 * xScale, 335 * yScale));
 	wPhase->setVisible(false);
 	btnPhaseStatus = env->addButton(rect<s32>(0 * xScale, 0 * yScale, 50 * xScale, 30 * yScale), wPhase, BUTTON_PHASE, L"");
+	    ChangeToIGUIImageButton(btnPhaseStatus, imageManager.tButton_S, imageManager.tButton_S_pressed);
 	btnPhaseStatus->setIsPushButton(true);
 	btnPhaseStatus->setPressed(true);
 	btnPhaseStatus->setVisible(false);
 	btnBP = env->addButton(rect<s32>(160 * xScale, 0 * yScale, 210 * xScale, 30 * yScale), wPhase, BUTTON_BP, L"\xff22\xff30");
+        ChangeToIGUIImageButton(btnBP, imageManager.tButton_S, imageManager.tButton_S_pressed);
 	btnBP->setVisible(false);
 	btnM2 = env->addButton(rect<s32>(160 * xScale, 0 * yScale, 210 * xScale, 30 * yScale), wPhase, BUTTON_M2, L"\xff2d\xff12");
+        ChangeToIGUIImageButton(btnM2, imageManager.tButton_S, imageManager.tButton_S_pressed);
 	btnM2->setVisible(false);
 	btnEP = env->addButton(rect<s32>(320 * xScale, 0 * yScale, 370 * xScale, 30 * yScale), wPhase, BUTTON_EP, L"\xff25\xff30");
+        ChangeToIGUIImageButton(btnEP, imageManager.tButton_S, imageManager.tButton_S_pressed);
 	btnEP->setVisible(false);
 #endif
     //tab（changed）
-	wInfos = env->addStaticText(L"", rect<s32>(1 * xScale, 275 * yScale, 260 * xScale, 639 * yScale), true, false, 0, -1, true);
-	wInfos->setBackgroundColor(0xab11113d);
+	wInfos = env->addWindow(rect<s32>(1 * xScale, 275 * yScale, 260 * xScale, 639 * yScale), false, L"");
+	wInfos->getCloseButton()->setVisible(false);
+	wInfos->setDraggable(false);
 	wInfos->setVisible(false);
+	    ChangeToIGUIImageWindow(wInfos, bgInfos, imageManager.tWindow_V);
 	//info
 	stName = env->addStaticText(L"", rect<s32>(10 * xScale, 10 * yScale, 250 * xScale, 32 * yScale), true, false, wInfos, -1, false);
 	stName->setTextAlignment(irr::gui::EGUIA_CENTER, irr::gui::EGUIA_CENTER);
@@ -759,7 +766,7 @@ bool Game::Initialize(ANDROID_APP app) {
 	wDeckManage = env->addWindow(rect<s32>(530 * xScale, 10 * yScale, 990 * xScale, 550 * yScale), false, dataManager.GetSysString(1460), 0, WINDOW_DECK_MANAGE);
 	wDeckManage->setVisible(false);
 	wDeckManage->getCloseButton()->setVisible(false);
-	    ChangeToIGUIImageWindow(wDeckManage, bgDeckManage, imageManager.tDialog_S);
+	    ChangeToIGUIImageWindow(wDeckManage, bgDeckManage, imageManager.tWindow_V);
 	lstCategories = env->addListBox(rect<s32>(10 * xScale, 30 * yScale, 140 * xScale, 530 * yScale), wDeckManage, LISTBOX_CATEGORIES, true);
     lstCategories->setItemHeight(25 * yScale);
 	lstDecks = env->addListBox(rect<s32>(150 * xScale, 30 * yScale, 340 * xScale, 530 * yScale), wDeckManage, LISTBOX_DECKS, true);

Classes/gframe/game.h

@@ -256,7 +256,7 @@ public:
 	irr::gui::CGUITTFont* titleFont;
 	std::map<irr::gui::CGUIImageButton*, int> imageLoading;
 	//card image
-	irr::gui::IGUIStaticText* wCardImg;
+	irr::gui::IGUIImage* wCardImg;
 	irr::gui::IGUIImage* imgCard;
 	//imageButtons pallet
 	irr::gui::IGUIWindow* wPallet;
@@ -281,7 +281,8 @@ public:
 	irr::gui::IGUIStaticText* stTip;
 	irr::gui::IGUIStaticText* stCardListTip;
 	//infos
-	irr::gui::IGUIStaticText* wInfos;
+	irr::gui::IGUIWindow* wInfos;
+	irr::gui::IGUIImage* bgInfos;
 	irr::gui::IGUIStaticText* stName;
 	irr::gui::IGUIStaticText* stInfo;
 	irr::gui::IGUIStaticText* stDataInfo;

Classes/gframe/image_manager.cpp

@@ -43,6 +43,7 @@ bool ImageManager::Initial(const path dir) {
 	tShut = driver->getTexture((dir + path("/textures/extra/tshut.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_V = driver->getTexture((dir + path("/textures/extra/sWindow_V.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());
 	tButton_L = driver->getTexture((dir + path("/textures/extra/sButton_L.png")).c_str());

Classes/gframe/image_manager.h

@@ -65,6 +65,7 @@ public:
 	irr::video::ITexture* tShut;
     irr::video::ITexture* tTitleBar;
 	irr::video::ITexture* tWindow;
+	irr::video::ITexture* tWindow_V;
 	irr::video::ITexture* tDialog_L;
 	irr::video::ITexture* tDialog_S;
 	irr::video::ITexture* tButton_L;