games/vcmi
1
0
Fork 0
mirror of https://github.com/vcmi/vcmi.git synced 2025-11-23 22:37:55 +02:00
Code Issues Releases Activity

Merge pull request #5877 from Laserlicht/panel_battle

Browse Source 
remove border in battle
This commit is contained in:
Ivan Savenko
2025-07-06 14:37:58 +03:00
committed by GitHub
parent 9c1b03cd8a 2189b8a8b6
commit d03d096aee
5 changed files with 51 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
client/adventureMap/TurnTimerWidget.cpp
View File

@@ -17,6 +17,8 @@
#include "../GameInstance.h" #include "../GameInstance.h"
#include "../media/ISoundPlayer.h" #include "../media/ISoundPlayer.h"
#include "../render/Graphics.h" #include "../render/Graphics.h"
#include "../render/IFont.h"
#include "../render/IRenderHandler.h"
#include "../widgets/Images.h" #include "../widgets/Images.h"
#include "../widgets/GraphicalPrimitiveCanvas.h" #include "../widgets/GraphicalPrimitiveCanvas.h"
#include "../widgets/TextControls.h" #include "../widgets/TextControls.h"
@@ -45,29 +47,28 @@ TurnTimerWidget::TurnTimerWidget(const Point & position, PlayerColor player)
const auto & timers = GAME->interface()->cb->getStartInfo()->turnTimerInfo; const auto & timers = GAME->interface()->cb->getStartInfo()->turnTimerInfo;
backgroundTexture = std::make_shared<CFilledTexture>(ImagePath::builtin("DiBoxBck"), pos); // 1 px smaller on all sides backgroundTexture = std::make_shared<CFilledTexture>(ImagePath::builtin("DiBoxBck"), pos); // 1 px smaller on all sides
if (isBattleMode)
backgroundBorder = std::make_shared<TransparentFilledRectangle>(pos, ColorRGBA(0, 0, 0, 128), Colors::BRIGHT_YELLOW); backgroundBorder = std::make_shared<TransparentFilledRectangle>(pos, ColorRGBA(0, 0, 0, 128), Colors::BRIGHT_YELLOW);
else
backgroundBorder = std::make_shared<TransparentFilledRectangle>(pos, ColorRGBA(0, 0, 0, 128), Colors::BLACK);
int bigFontHeight = ENGINE->renderHandler().loadFont(FONT_BIG)->getLineHeight();
pos.h += 6;
if (isBattleMode) if (isBattleMode)
{ {
pos.w = 76; pos.w = 77;
pos.h += 20; pos.h += bigFontHeight - 4;
playerLabelsMain[player] = std::make_shared<CLabel>(pos.w / 2, pos.h - 10, FONT_BIG, ETextAlignment::CENTER, graphics->playerColors[player.getNum()], ""); playerLabelsMain[player] = std::make_shared<CLabel>(pos.w / 2, pos.h - 2, FONT_BIG, ETextAlignment::BOTTOMCENTER, graphics->playerColors[player.getNum()], "");
if (timers.battleTimer != 0) if (timers.battleTimer != 0)
{ {
pos.h += 20; pos.h += bigFontHeight;
playerLabelsBattle[player] = std::make_shared<CLabel>(pos.w / 2, pos.h - 10, FONT_BIG, ETextAlignment::CENTER, graphics->playerColors[player.getNum()], ""); playerLabelsBattle[player] = std::make_shared<CLabel>(pos.w / 2, pos.h - 2, FONT_BIG, ETextAlignment::BOTTOMCENTER, graphics->playerColors[player.getNum()], "");
} }
if (!timers.accumulatingUnitTimer && timers.unitTimer != 0) if (!timers.accumulatingUnitTimer && timers.unitTimer != 0)
{ {
pos.h += 20; pos.h += bigFontHeight;
playerLabelsUnit[player] = std::make_shared<CLabel>(pos.w / 2, pos.h - 10, FONT_BIG, ETextAlignment::CENTER, graphics->playerColors[player.getNum()], ""); playerLabelsUnit[player] = std::make_shared<CLabel>(pos.w / 2, pos.h - 2, FONT_BIG, ETextAlignment::BOTTOMCENTER, graphics->playerColors[player.getNum()], "");
} }
updateTextLabel(player, GAME->interface()->cb->getPlayerTurnTime(player)); updateTextLabel(player, GAME->interface()->cb->getPlayerTurnTime(player));
@@ -75,9 +76,9 @@ TurnTimerWidget::TurnTimerWidget(const Point & position, PlayerColor player)
else else
{ {
if (!timers.accumulatingTurnTimer && timers.baseTimer != 0) if (!timers.accumulatingTurnTimer && timers.baseTimer != 0)
pos.w = 120; pos.w = 130;
else else
pos.w = 60; pos.w = 70;
for(PlayerColor player(0); player < PlayerColor::PLAYER_LIMIT; ++player) for(PlayerColor player(0); player < PlayerColor::PLAYER_LIMIT; ++player)
{ {
@@ -87,8 +88,8 @@ TurnTimerWidget::TurnTimerWidget(const Point & position, PlayerColor player)
if (!GAME->interface()->cb->getStartInfo()->playerInfos.at(player).isControlledByHuman()) if (!GAME->interface()->cb->getStartInfo()->playerInfos.at(player).isControlledByHuman())
continue; continue;
pos.h += 20; pos.h += bigFontHeight - 4;
playerLabelsMain[player] = std::make_shared<CLabel>(pos.w / 2, pos.h - 10, FONT_BIG, ETextAlignment::CENTER, graphics->playerColors[player.getNum()], ""); playerLabelsMain[player] = std::make_shared<CLabel>(pos.w / 2, pos.h - 2, FONT_BIG, ETextAlignment::BOTTOMCENTER, graphics->playerColors[player.getNum()], "");
updateTextLabel(player, GAME->interface()->cb->getPlayerTurnTime(player)); updateTextLabel(player, GAME->interface()->cb->getPlayerTurnTime(player));
} }

47
client/battle/BattleWindow.cpp
View File

@@ -191,10 +191,10 @@ void BattleWindow::createQuickSpellWindow()
OBJECT_CONSTRUCTION; OBJECT_CONSTRUCTION;
quickSpellWindow = std::make_shared<QuickSpellPanel>(owner); quickSpellWindow = std::make_shared<QuickSpellPanel>(owner);
quickSpellWindow->moveTo(Point(pos.x - 67, pos.y)); quickSpellWindow->moveTo(Point(pos.x - 52, pos.y));
unitActionWindow = std::make_shared<UnitActionPanel>(owner); unitActionWindow = std::make_shared<UnitActionPanel>(owner);
unitActionWindow->moveTo(Point(pos.x + pos.w + 15, pos.y)); unitActionWindow->moveTo(Point(pos.x + pos.w, pos.y));
if(settings["battle"]["enableQuickSpellPanel"].Bool()) if(settings["battle"]["enableQuickSpellPanel"].Bool())
showStickyQuickSpellWindow(); showStickyQuickSpellWindow();
@@ -218,8 +218,8 @@ void BattleWindow::hideStickyQuickSpellWindow()
quickSpellWindow->disable(); quickSpellWindow->disable();
unitActionWindow->disable(); unitActionWindow->disable();
setPositionInfoWindow();
createTimerInfoWindows(); createTimerInfoWindows();
setPositionInfoWindow();
ENGINE->windows().totalRedraw(); ENGINE->windows().totalRedraw();
} }
@@ -236,8 +236,8 @@ void BattleWindow::showStickyQuickSpellWindow()
quickSpellWindow->setEnabled(quickSpellWindowVisible); quickSpellWindow->setEnabled(quickSpellWindowVisible);
unitActionWindow->setEnabled(unitActionWindowVisible); unitActionWindow->setEnabled(unitActionWindowVisible);
setPositionInfoWindow();
createTimerInfoWindows(); createTimerInfoWindows();
setPositionInfoWindow();
ENGINE->windows().totalRedraw(); ENGINE->windows().totalRedraw();
} }
@@ -245,8 +245,8 @@ void BattleWindow::createTimerInfoWindows()
{ {
OBJECT_CONSTRUCTION; OBJECT_CONSTRUCTION;
int xOffsetAttacker = quickSpellWindow->isDisabled() ? 0 : -53; int xOffsetAttacker = quickSpellWindow->isDisabled() ? 0 : -51;
int xOffsetDefender = unitActionWindow->isDisabled() ? 0 : 53; int xOffsetDefender = unitActionWindow->isDisabled() ? 0 : 51;
if(GAME->interface()->cb->getStartInfo()->turnTimerInfo.battleTimer != 0 || GAME->interface()->cb->getStartInfo()->turnTimerInfo.unitTimer != 0) if(GAME->interface()->cb->getStartInfo()->turnTimerInfo.battleTimer != 0 || GAME->interface()->cb->getStartInfo()->turnTimerInfo.unitTimer != 0)
{ {
@@ -255,16 +255,16 @@ void BattleWindow::createTimerInfoWindows()
if (attacker.isValidPlayer()) if (attacker.isValidPlayer())
{ {
if (ENGINE->screenDimensions().x >= 1000) if (ENGINE->screenDimensions().x >= 960)
attackerTimerWidget = std::make_shared<TurnTimerWidget>(Point(-92 + xOffsetAttacker, 1), attacker); attackerTimerWidget = std::make_shared<TurnTimerWidget>(Point(-76 + xOffsetAttacker, 0), attacker);
else else
attackerTimerWidget = std::make_shared<TurnTimerWidget>(Point(1, 135), attacker); attackerTimerWidget = std::make_shared<TurnTimerWidget>(Point(1, 135), attacker);
} }
if (defender.isValidPlayer()) if (defender.isValidPlayer())
{ {
if (ENGINE->screenDimensions().x >= 1000) if (ENGINE->screenDimensions().x >= 960)
defenderTimerWidget = std::make_shared<TurnTimerWidget>(Point(pos.w + 16 + xOffsetDefender, 1), defender); defenderTimerWidget = std::make_shared<TurnTimerWidget>(Point(pos.w + xOffsetDefender, 0), defender);
else else
defenderTimerWidget = std::make_shared<TurnTimerWidget>(Point(pos.w - 78, 135), defender); defenderTimerWidget = std::make_shared<TurnTimerWidget>(Point(pos.w - 78, 135), defender);
} }
@@ -383,34 +383,37 @@ void BattleWindow::updateQueue()
void BattleWindow::setPositionInfoWindow() void BattleWindow::setPositionInfoWindow()
{ {
int xOffsetAttacker = quickSpellWindow->isDisabled() ? 0 : -53; int xOffsetAttacker = quickSpellWindow->isDisabled() ? 0 : -51;
int xOffsetDefender = unitActionWindow->isDisabled() ? 0 : 53; int xOffsetDefender = unitActionWindow->isDisabled() ? 0 : 51;
int yOffsetAttacker = attackerTimerWidget ? attackerTimerWidget->pos.h + 9 : 0;
int yOffsetDefender = defenderTimerWidget ? defenderTimerWidget->pos.h + 9 : 0;
if(defenderHeroWindow) if(defenderHeroWindow)
{ {
Point position = (ENGINE->screenDimensions().x >= 1000) Point position = (ENGINE->screenDimensions().x >= 960)
? Point(pos.x + pos.w + 15 + xOffsetDefender, pos.y + 60) ? Point(pos.x + pos.w - 1 + xOffsetDefender, pos.y - 1 + yOffsetDefender)
: Point(pos.x + pos.w -79, pos.y + 195); : Point(pos.x + pos.w -79, pos.y + 195);
defenderHeroWindow->moveTo(position); defenderHeroWindow->moveTo(position);
} }
if(attackerHeroWindow) if(attackerHeroWindow)
{ {
Point position = (ENGINE->screenDimensions().x >= 1000) Point position = (ENGINE->screenDimensions().x >= 960)
? Point(pos.x - 93 + xOffsetAttacker, pos.y + 60) ? Point(pos.x - 77 + xOffsetAttacker, pos.y - 1 + yOffsetAttacker)
: Point(pos.x + 1, pos.y + 195); : Point(pos.x + 1, pos.y + 195);
attackerHeroWindow->moveTo(position); attackerHeroWindow->moveTo(position);
} }
if(defenderStackWindow) if(defenderStackWindow)
{ {
Point position = (ENGINE->screenDimensions().x >= 1000) Point position = (ENGINE->screenDimensions().x >= 960)
? Point(pos.x + pos.w + 15 + xOffsetDefender, defenderHeroWindow ? defenderHeroWindow->pos.y + 210 : pos.y + 60) ? Point(pos.x + pos.w - 1 + xOffsetDefender, defenderHeroWindow ? defenderHeroWindow->pos.y + 210 : pos.y - 1 + yOffsetDefender)
: Point(pos.x + pos.w -79, defenderHeroWindow ? defenderHeroWindow->pos.y : pos.y + 195); : Point(pos.x + pos.w -79, defenderHeroWindow ? defenderHeroWindow->pos.y : pos.y + 195);
defenderStackWindow->moveTo(position); defenderStackWindow->moveTo(position);
} }
if(attackerStackWindow) if(attackerStackWindow)
{ {
Point position = (ENGINE->screenDimensions().x >= 1000) Point position = (ENGINE->screenDimensions().x >= 960)
? Point(pos.x - 93 + xOffsetAttacker, attackerHeroWindow ? attackerHeroWindow->pos.y + 210 : pos.y + 60) ? Point(pos.x - 77 + xOffsetAttacker, attackerHeroWindow ? attackerHeroWindow->pos.y + 210 : pos.y - 1 + yOffsetAttacker)
: Point(pos.x + 1, attackerHeroWindow ? attackerHeroWindow->pos.y : pos.y + 195); : Point(pos.x + 1, attackerHeroWindow ? attackerHeroWindow->pos.y : pos.y + 195);
attackerStackWindow->moveTo(position); attackerStackWindow->moveTo(position);
} }
@@ -444,8 +447,8 @@ void BattleWindow::updateStackInfoWindow(const CStack * stack)
else else
attackerStackWindow = nullptr; attackerStackWindow = nullptr;
setPositionInfoWindow();
createTimerInfoWindows(); createTimerInfoWindows();
setPositionInfoWindow();
} }
void BattleWindow::heroManaPointsChanged(const CGHeroInstance * hero) void BattleWindow::heroManaPointsChanged(const CGHeroInstance * hero)
@@ -847,7 +850,7 @@ void BattleWindow::showAll(Canvas & to)
CIntObject::showAll(to); CIntObject::showAll(to);
if (ENGINE->screenDimensions().x != 800 || ENGINE->screenDimensions().y !=600) if (ENGINE->screenDimensions().x != 800 || ENGINE->screenDimensions().y !=600)
CMessage::drawBorder(owner.curInt->playerID, to, pos.w+28, pos.h+29, pos.x-14, pos.y-15); to.drawBorder(Rect(pos.x-1, pos.y, pos.w+2, pos.h+1), Colors::BRIGHT_YELLOW);
} }
void BattleWindow::show(Canvas & to) void BattleWindow::show(Canvas & to)

2
client/battle/HeroInfoWindow.cpp
View File

@@ -26,7 +26,7 @@ HeroInfoBasicPanel::HeroInfoBasicPanel(const InfoAboutHero & hero, const Point *
if(initializeBackground) if(initializeBackground)
{ {
background = std::make_shared<CPicture>(ImagePath::builtin("CHRPOP")); background = std::make_shared<CPicture>(ImagePath::builtin("CHRPOP"), Rect(1, 1, 76, 200), 1, 1);
background->setPlayerColor(hero.owner); background->setPlayerColor(hero.owner);
} }

4
client/battle/StackInfoBasicPanel.cpp
View File

@@ -27,10 +27,10 @@ StackInfoBasicPanel::StackInfoBasicPanel(const CStack * stack, bool initializeBa
if(initializeBackground) if(initializeBackground)
{ {
background = std::make_shared<CPicture>(ImagePath::builtin("CCRPOP")); background = std::make_shared<CPicture>(ImagePath::builtin("CCRPOP"), Rect(1, 1, 76, 286), 1, 1);
background->pos.y += 37; background->pos.y += 37;
background->setPlayerColor(stack->getOwner()); background->setPlayerColor(stack->getOwner());
background2 = std::make_shared<CPicture>(ImagePath::builtin("CHRPOP")); background2 = std::make_shared<CPicture>(ImagePath::builtin("CHRPOP"), Rect(1, 1, 76, 200), 1, 1);
background2->setPlayerColor(stack->getOwner()); background2->setPlayerColor(stack->getOwner());
} }

6
config/widgets/battleWindow2.json
View File

@@ -8,6 +8,12 @@
"position": {"x": 0, "y": 556}, "position": {"x": 0, "y": 556},
"image": "COPLACBR.bmp" "image": "COPLACBR.bmp"
}, },
{
// fix transparent gap between content and border
"type": "transparentFilledRectangle",
"rect": {"x": 0, "y": 555, "w": 801, "h": 46},
"color": [0, 0, 0, 255]
},
{ {
"type": "picture", "type": "picture",
"name": "menuBattle", "name": "menuBattle",