games/vcmi
1
0
Fork 0
mirror of https://github.com/vcmi/vcmi.git synced 2026-06-19 22:57:37 +02:00
Code Issues Releases Activity

Tweaks for adaptive battle window UI

Browse Source 
Now quick spell/actions windows have a priority over info windows (timer
/ hero / unit) if there is not enough space for both.

This means that:
- quick actions window can now be enabled if screen is at least 900px-
wide (and not 1050px)
- info windows now account for quick action window presence. If quick
actions window is active, info windows will be placed inside battle
window if screen is below 1050px wide

This makes it possible to use quick actions window in most resolutions,
for example - in 16x10 screens with maxed out resolution scaling.

No changes in actual window layout.
This commit is contained in:
Ivan Savenko
2025-07-06 18:20:34 +03:00
parent d03d096aee
commit cdf7230da6
2 changed files with 35 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
client/battle/BattleWindow.cpp
+31 -8
View File
@@ -230,8 +230,8 @@ void BattleWindow::showStickyQuickSpellWindow()
auto hero = owner.getBattle()->battleGetMyHero();
bool quickSpellWindowVisible = ENGINE->screenDimensions().x >= 1050 && hero != nullptr && hero->hasSpellbook();
bool unitActionWindowVisible = ENGINE->screenDimensions().x >= 1050;
bool quickSpellWindowVisible = hasSpaceForQuickActions() && hero != nullptr && hero->hasSpellbook();
bool unitActionWindowVisible = hasSpaceForQuickActions();
quickSpellWindow->setEnabled(quickSpellWindowVisible);
unitActionWindow->setEnabled(unitActionWindowVisible);
@@ -255,7 +255,7 @@ void BattleWindow::createTimerInfoWindows()
if (attacker.isValidPlayer())
{
if (ENGINE->screenDimensions().x >= 960)
if (placeInfoWindowsOutside())
attackerTimerWidget = std::make_shared<TurnTimerWidget>(Point(-76 + xOffsetAttacker, 0), attacker);
else
attackerTimerWidget = std::make_shared<TurnTimerWidget>(Point(1, 135), attacker);
@@ -263,7 +263,7 @@ void BattleWindow::createTimerInfoWindows()
if (defender.isValidPlayer())
{
if (ENGINE->screenDimensions().x >= 960)
if (placeInfoWindowsOutside())
defenderTimerWidget = std::make_shared<TurnTimerWidget>(Point(pos.w + xOffsetDefender, 0), defender);
else
defenderTimerWidget = std::make_shared<TurnTimerWidget>(Point(pos.w - 78, 135), defender);
@@ -391,28 +391,28 @@ void BattleWindow::setPositionInfoWindow()
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 -79, pos.y + 195);
defenderHeroWindow->moveTo(position);
}
if(attackerHeroWindow)
{
Point position = (ENGINE->screenDimensions().x >= 960)
Point position = placeInfoWindowsOutside()
? Point(pos.x - 77 + xOffsetAttacker, pos.y - 1 + yOffsetAttacker)
: Point(pos.x + 1, pos.y + 195);
attackerHeroWindow->moveTo(position);
}
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 -79, defenderHeroWindow ? defenderHeroWindow->pos.y : pos.y + 195);
defenderStackWindow->moveTo(position);
}
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 + 1, attackerHeroWindow ? attackerHeroWindow->pos.y : pos.y + 195);
attackerStackWindow->moveTo(position);
@@ -865,3 +865,26 @@ void BattleWindow::close()
logGlobal->error("Only top interface must be closed");
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();
}
client/battle/BattleWindow.h
+4
View File
@@ -83,6 +83,10 @@ class BattleWindow : public InterfaceObjectConfigurable
bool onlyOnePlayerHuman;
bool hasSpaceForQuickActions() const;
bool quickActionsPanelActive() const;
bool placeInfoWindowsOutside() const;
public:
BattleWindow(BattleInterface & owner );