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

Merge pull request #5890 from IvanSavenko/battle_layout_fix

Browse Source 
Tweaks for adaptive battle window UI
This commit is contained in:
Ivan Savenko
2025-07-08 10:05:27 +03:00
committed by GitHub
parent f76b2efee6 cdf7230da6
commit 0c037c6992
2 changed files with 35 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

39
client/battle/BattleWindow.cpp
View File

@@ -230,8 +230,8 @@ void BattleWindow::showStickyQuickSpellWindow()
auto hero = owner.getBattle()->battleGetMyHero(); auto hero = owner.getBattle()->battleGetMyHero();
bool quickSpellWindowVisible = ENGINE->screenDimensions().x >= 1050 && hero != nullptr && hero->hasSpellbook(); bool quickSpellWindowVisible = hasSpaceForQuickActions() && hero != nullptr && hero->hasSpellbook();
bool unitActionWindowVisible = ENGINE->screenDimensions().x >= 1050; bool unitActionWindowVisible = hasSpaceForQuickActions();
quickSpellWindow->setEnabled(quickSpellWindowVisible); quickSpellWindow->setEnabled(quickSpellWindowVisible);
unitActionWindow->setEnabled(unitActionWindowVisible); unitActionWindow->setEnabled(unitActionWindowVisible);
@@ -255,7 +255,7 @@ void BattleWindow::createTimerInfoWindows()
if (attacker.isValidPlayer()) if (attacker.isValidPlayer())
{ {
if (ENGINE->screenDimensions().x >= 960) if (placeInfoWindowsOutside())
attackerTimerWidget = std::make_shared<TurnTimerWidget>(Point(-76 + xOffsetAttacker, 0), 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);
@@ -263,7 +263,7 @@ void BattleWindow::createTimerInfoWindows()
if (defender.isValidPlayer()) if (defender.isValidPlayer())
{ {
if (ENGINE->screenDimensions().x >= 960) if (placeInfoWindowsOutside())
defenderTimerWidget = std::make_shared<TurnTimerWidget>(Point(pos.w + xOffsetDefender, 0), 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);
@@ -391,28 +391,28 @@ void BattleWindow::setPositionInfoWindow()
if(defenderHeroWindow) if(defenderHeroWindow)
{ {
Point position = (ENGINE->screenDimensions().x >= 960) Point position = placeInfoWindowsOutside()
? Point(pos.x + pos.w - 1 + xOffsetDefender, pos.y - 1 + yOffsetDefender) ? 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 >= 960) Point position = placeInfoWindowsOutside()
? Point(pos.x - 77 + xOffsetAttacker, pos.y - 1 + yOffsetAttacker) ? 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 >= 960) Point position = placeInfoWindowsOutside()
? Point(pos.x + pos.w - 1 + xOffsetDefender, defenderHeroWindow ? defenderHeroWindow->pos.y + 210 : pos.y - 1 + yOffsetDefender) ? 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 >= 960) Point position = placeInfoWindowsOutside()
? Point(pos.x - 77 + xOffsetAttacker, attackerHeroWindow ? attackerHeroWindow->pos.y + 210 : pos.y - 1 + yOffsetAttacker) ? 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);
@@ -865,3 +865,26 @@ void BattleWindow::close()
logGlobal->error("Only top interface must be closed"); logGlobal->error("Only top interface must be closed");
ENGINE->windows().popWindows(1); ENGINE->windows().popWindows(1);
} }
bool BattleWindow::hasSpaceForQuickActions() const
{
constexpr int widthWithQuickActions = 800 + 50*2;
return ENGINE->screenDimensions().x >= widthWithQuickActions;
}
bool BattleWindow::placeInfoWindowsOutside() const
{
constexpr int widthWithQuickActions = 800 + 50*2 + 75*2;
constexpr int widthBaseWindow = 800 + 75*2;
if (quickActionsPanelActive())
return ENGINE->screenDimensions().x >= widthWithQuickActions;
else
return ENGINE->screenDimensions().x >= widthBaseWindow;
}
bool BattleWindow::quickActionsPanelActive() const
{
return unitActionWindow->isActive();
}

4
client/battle/BattleWindow.h
View File

@@ -83,6 +83,10 @@ class BattleWindow : public InterfaceObjectConfigurable
bool onlyOnePlayerHuman; bool onlyOnePlayerHuman;
bool hasSpaceForQuickActions() const;
bool quickActionsPanelActive() const;
bool placeInfoWindowsOutside() const;
public: public:
BattleWindow(BattleInterface & owner ); BattleWindow(BattleInterface & owner );