mirror of
https://github.com/vcmi/vcmi.git
synced 2025-01-10 00:43:59 +02:00
commit
06c7aa90e2
@ -1064,7 +1064,7 @@ StackQueue::StackBox::StackBox(StackQueue * owner):
|
|||||||
icon = std::make_shared<CAnimImage>(AnimationPath::builtin("TWCRPORT"), 0, 0, 9, 1);
|
icon = std::make_shared<CAnimImage>(AnimationPath::builtin("TWCRPORT"), 0, 0, 9, 1);
|
||||||
amount = std::make_shared<CLabel>(pos.w/2, pos.h - 8, FONT_MEDIUM, ETextAlignment::CENTER, Colors::WHITE);
|
amount = std::make_shared<CLabel>(pos.w/2, pos.h - 8, FONT_MEDIUM, ETextAlignment::CENTER, Colors::WHITE);
|
||||||
roundRect = std::make_shared<TransparentFilledRectangle>(Rect(0, 0, 15, 18), ColorRGBA(0, 0, 0, 255), ColorRGBA(241, 216, 120, 255));
|
roundRect = std::make_shared<TransparentFilledRectangle>(Rect(0, 0, 15, 18), ColorRGBA(0, 0, 0, 255), ColorRGBA(241, 216, 120, 255));
|
||||||
round = std::make_shared<CLabel>(4, 2, FONT_SMALL, ETextAlignment::TOPLEFT, Colors::WHITE);
|
round = std::make_shared<CLabel>(6, 9, FONT_SMALL, ETextAlignment::CENTER, Colors::WHITE);
|
||||||
|
|
||||||
Point iconPos(pos.w - 16, pos.h - 16);
|
Point iconPos(pos.w - 16, pos.h - 16);
|
||||||
|
|
||||||
@ -1105,6 +1105,7 @@ void StackQueue::StackBox::setUnit(const battle::Unit * unit, size_t turn, std::
|
|||||||
const auto & font = GH.renderHandler().loadFont(FONT_SMALL);
|
const auto & font = GH.renderHandler().loadFont(FONT_SMALL);
|
||||||
int len = font->getStringWidth(tmp);
|
int len = font->getStringWidth(tmp);
|
||||||
roundRect->pos.w = len + 6;
|
roundRect->pos.w = len + 6;
|
||||||
|
round->pos = Rect(roundRect->pos.center().x, roundRect->pos.center().y, 0, 0);
|
||||||
round->setText(tmp);
|
round->setText(tmp);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -137,7 +137,6 @@ void ImageScaled::prepareImages()
|
|||||||
|
|
||||||
switch(blitMode)
|
switch(blitMode)
|
||||||
{
|
{
|
||||||
case EImageBlitMode::SIMPLE:
|
|
||||||
case EImageBlitMode::WITH_SHADOW:
|
case EImageBlitMode::WITH_SHADOW:
|
||||||
case EImageBlitMode::ONLY_SHADOW:
|
case EImageBlitMode::ONLY_SHADOW:
|
||||||
case EImageBlitMode::WITH_SHADOW_AND_OVERLAY:
|
case EImageBlitMode::WITH_SHADOW_AND_OVERLAY:
|
||||||
|
Loading…
Reference in New Issue
Block a user