From bf4024c3aca0bd57d4014a7349918b4ed8c99386 Mon Sep 17 00:00:00 2001 From: FeniksFire Date: Fri, 22 Dec 2017 20:52:13 +0100 Subject: [PATCH] Adding bacground for QuickRecruitmentWindow Adding bacground for CreaturePurchaseCard in QuickRecruitmentWindow --- .../CreaturePurchaseCard.png | Bin 0 -> 5666 bytes client/windows/CreaturePurchaseCard.cpp | 9 +++++---- client/windows/CreaturePurchaseCard.h | 1 + 3 files changed, 6 insertions(+), 4 deletions(-) create mode 100644 Mods/vcmi/Data/QuickRecruitmentWindow/CreaturePurchaseCard.png diff --git a/Mods/vcmi/Data/QuickRecruitmentWindow/CreaturePurchaseCard.png b/Mods/vcmi/Data/QuickRecruitmentWindow/CreaturePurchaseCard.png new file mode 100644 index 0000000000000000000000000000000000000000..9920a1ea2a1e77f736ae22715be30f1ebda470e0 GIT binary patch literal 5666 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 O0G)dVkhkjai2njF1*NC} literal 0 HcmV?d00001 diff --git a/client/windows/CreaturePurchaseCard.cpp b/client/windows/CreaturePurchaseCard.cpp index d01a7817a..a66a39714 100644 --- a/client/windows/CreaturePurchaseCard.cpp +++ b/client/windows/CreaturePurchaseCard.cpp @@ -36,7 +36,7 @@ void CreaturePurchaseCard::initMinButton() void CreaturePurchaseCard::initCreatureSwitcherButton() { - creatureSwitcher = std::make_shared(Point(pos.x + 20, pos.y-33), "iDv6432.def", CButton::tooltip(), [&](){ switchCreatureLevel(); }); + creatureSwitcher = std::make_shared(Point(pos.x + 18, pos.y-37), "iDv6432.def", CButton::tooltip(), [&](){ switchCreatureLevel(); }); } void CreaturePurchaseCard::switchCreatureLevel() @@ -52,8 +52,8 @@ void CreaturePurchaseCard::switchCreatureLevel() void CreaturePurchaseCard::initAmountInfo() { - availableAmount = std::make_shared(pos.x + 27, pos.y + 146, FONT_SMALL, CENTER, Colors::YELLOW); - purhaseAmount = std::make_shared(pos.x + 77, pos.y + 146, FONT_SMALL, CENTER, Colors::WHITE); + availableAmount = std::make_shared(pos.x + 24, pos.y + 144, FONT_SMALL, CENTER, Colors::YELLOW); + purhaseAmount = std::make_shared(pos.x + 77, pos.y + 144, FONT_SMALL, CENTER, Colors::WHITE); updateAmountInfo(0); } @@ -70,7 +70,7 @@ void CreaturePurchaseCard::initSlider() void CreaturePurchaseCard::initCostBox() { - cost = std::make_shared(Rect(pos.x, pos.y + 194, 97, 74), ""); + cost = std::make_shared(Rect(pos.x+2, pos.y + 194, 97, 74), ""); cost->createItems(creatureOnTheCard->cost); } @@ -95,6 +95,7 @@ CreaturePurchaseCard::CreaturePurchaseCard(const std::vector & creat void CreaturePurchaseCard::initView() { picture = std::make_shared(pos.x, pos.y, creatureOnTheCard); + background = std::make_shared("QuickRecruitmentWindow/CreaturePurchaseCard.png", pos.x-4, pos.y-50); initAmountInfo(); initSlider(); initButtons(); diff --git a/client/windows/CreaturePurchaseCard.h b/client/windows/CreaturePurchaseCard.h index 59d156512..91ce2b4bb 100644 --- a/client/windows/CreaturePurchaseCard.h +++ b/client/windows/CreaturePurchaseCard.h @@ -47,4 +47,5 @@ private: std::shared_ptr picture; std::shared_ptr cost; std::vector upgradesID; + std::shared_ptr background; };