Add DECK_WINDOW_HOVERED_CARD_OUTLINE skin valur

edo9300 · Jan 25, 2021 · 95a2ba4 · 95a2ba4
1 parent b4c812d
commit 95a2ba4
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 6 deletions.
diff --git a/gframe/custom_skin_enum.inl b/gframe/custom_skin_enum.inl
@@ -23,8 +23,12 @@ WINDOWRECT(SIDE, 0x40000000, 0x40000000, 0x400000ff, 0x400000ff, 0xffffffff)
 WINDOWRECT(SEARCH_RESULT_INFO, 0x40000000, 0x40000000, 0x400000ff, 0x400000ff, 0xffffffff)
 WINDOWRECT(SEARCH_RESULT, 0x40000000, 0x40000000, 0x400000ff, 0x400000ff, 0xffffffff)
 
+#undef WINDOWRECT
+
 DECLR(DECK_WINDOW_HOVERED_CARD_RESULT, 0x80000000)
 
+DECLR(DECK_WINDOW_HOVERED_CARD_OUTLINE, 0xffffffff)
+
 DECLR(DUELFIELD_ANNOUNCE_TEXT_BACKGROUND_COLOR, CLR(192, 192, 192, 192))
 DECLR(DUELFIELD_ANNOUNCE_TEXT_COLOR, 0)
 DECLR(DUELFIELD_CARD_OPPONENT_WINDOW_BACKGROUND, 0xffffffff)
@@ -87,6 +91,4 @@ DECLR(DUELFIELD_CARD_PSCALE, 0xffffffff)
 DECLR(DUELFIELD_STACK, 0xffffff00)
 DECLR(DUELFIELD_TURN_COUNT, 0x8000ffff)
 DECLR(DUELFIELD_LP_1, 0xffffff00)
-DECLR(DUELFIELD_LP_2, 0xffffff00)
-
-#undef WINDOWRECT
+DECLR(DUELFIELD_LP_2, 0xffffff00)
diff --git a/gframe/drawing.cpp b/gframe/drawing.cpp
@@ -1272,7 +1272,7 @@ void Game::DrawDeckBd() {
 		for(size_t i = 0; i < gdeckManager->current_deck.main.size(); ++i) {
 			DrawThumb(gdeckManager->current_deck.main[i], irr::core::vector2di(314 + (i % lx) * dx, 164 + (i / lx) * 68), deckBuilder.filterList);
 			if(deckBuilder.hovered_pos == 1 && deckBuilder.hovered_seq == (int)i)
-				driver->draw2DRectangleOutline(Resize(313 + (i % lx) * dx, 163 + (i / lx) * 68, 359 + (i % lx) * dx, 228 + (i / lx) * 68));
+				driver->draw2DRectangleOutline(Resize(313 + (i % lx) * dx, 163 + (i / lx) * 68, 359 + (i % lx) * dx, 228 + (i / lx) * 68), skin::DECK_WINDOW_HOVERED_CARD_OUTLINE_VAL);
 		}
 	}
 	//extra deck
@@ -1306,7 +1306,7 @@ void Game::DrawDeckBd() {
 		for(size_t i = 0; i < gdeckManager->current_deck.extra.size(); ++i) {
 			DrawThumb(gdeckManager->current_deck.extra[i], irr::core::vector2di(314 + i * dx, 466), deckBuilder.filterList);
 			if(deckBuilder.hovered_pos == 2 && deckBuilder.hovered_seq == (int)i)
-				driver->draw2DRectangleOutline(Resize(313 + i * dx, 465, 359 + i * dx, 531));
+				driver->draw2DRectangleOutline(Resize(313 + i * dx, 465, 359 + i * dx, 531), skin::DECK_WINDOW_HOVERED_CARD_OUTLINE_VAL);
 		}
 	}
 	//side deck
@@ -1338,7 +1338,7 @@ void Game::DrawDeckBd() {
 		for(size_t i = 0; i < gdeckManager->current_deck.side.size(); ++i) {
 			DrawThumb(gdeckManager->current_deck.side[i], irr::core::vector2di(314 + i * dx, 564), deckBuilder.filterList);
 			if(deckBuilder.hovered_pos == 3 && deckBuilder.hovered_seq == (int)i)
-				driver->draw2DRectangleOutline(Resize(313 + i * dx, 563, 359 + i * dx, 629));
+				driver->draw2DRectangleOutline(Resize(313 + i * dx, 563, 359 + i * dx, 629), skin::DECK_WINDOW_HOVERED_CARD_OUTLINE_VAL);
 		}
 	}
 	//search result