adjusted position calculation of battle ui

diff --git a/src/battle/BattleState.cpp b/src/battle/BattleState.cpp
index 36c19979224c281bf83227c60d6792dc03a4a7ab..2b46cacb879f405eb5d1118dc94d62d709fc8a59 100644 (file)
--- a/src/battle/BattleState.cpp
+++ b/src/battle/BattleState.cpp
@@ -112,15 +112,16 @@ void BattleState::RenderHeroes(SDL_Surface *screen, const Vector<int> &offset) {
 }
 
 void BattleState::RenderHeroTags(SDL_Surface *screen, const Vector<int> &offset) {
-       int uiHeight(BackgroundHeight() / 2), uiOffset(uiHeight);
-       int tagHeight((uiHeight - attackTypeMenu.IconHeight()) / 2);
-       int tagWidth((BackgroundWidth() - attackTypeMenu.IconWidth()) / 2);
+       int margin(attackTypeMenu.Height() / 48);
+       int tagHeight(attackTypeMenu.Height() - 2 * margin);
+       int tagWidth(attackTypeMenu.Width() * 2 + attackTypeMenu.Width() / 2 - 2 * margin);
+       int xOffset((BackgroundWidth() - 2 * tagWidth - 2 * margin) / 2);
 
        Point<int> tagPosition[4];
-       tagPosition[0] = Point<int>(0, uiOffset);
-       tagPosition[1] = Point<int>(tagWidth + attackTypeMenu.IconWidth(), uiOffset);
-       tagPosition[2] = Point<int>(0, uiOffset + tagHeight + attackTypeMenu.IconHeight());
-       tagPosition[3] = Point<int>(tagWidth + attackTypeMenu.IconWidth(), uiOffset + tagHeight + attackTypeMenu.IconHeight());
+       tagPosition[0] = Point<int>(xOffset, BackgroundHeight() - 2 * tagHeight - margin);
+       tagPosition[1] = Point<int>(xOffset + tagWidth + 2 * margin, BackgroundHeight() - 2 * tagHeight - margin);
+       tagPosition[2] = Point<int>(xOffset, BackgroundHeight() - tagHeight - margin);
+       tagPosition[3] = Point<int>(xOffset + tagWidth + 2 * margin, BackgroundHeight() - tagHeight - margin);
 
        for (vector<HeroTag>::size_type i(0), end(heroTags.size()); i < end; ++i) {
                heroTags[i].Render(screen, tagWidth, tagHeight, tagPosition[i] + offset, (int)i == activeHero);

diff --git a/src/battle/states/SelectAttackType.cpp b/src/battle/states/SelectAttackType.cpp
index c7a65be7a3ade4d69d9c54895d2248d24ac587d0..2664295929ca873055902587c0764a1f93b310a0 100644 (file)
--- a/src/battle/states/SelectAttackType.cpp
+++ b/src/battle/states/SelectAttackType.cpp
@@ -101,7 +101,7 @@ void SelectAttackType::Render(SDL_Surface *screen) {
 void SelectAttackType::RenderMenu(SDL_Surface *screen, const Vector<int> &offset) {
        Point<int> position(
                        (battle->BackgroundWidth() - battle->GetAttackTypeMenu().Width()) / 2,
-                       (battle->BackgroundHeight() * 3 / 4) - (battle->GetAttackTypeMenu().Height() / 2));
+                       battle->BackgroundHeight() - battle->GetAttackTypeMenu().Height() - battle->GetAttackTypeMenu().Height() / 2);
        battle->GetAttackTypeMenu().Render(screen, position + offset);
 }
 

diff --git a/src/battle/states/SelectMoveAction.cpp b/src/battle/states/SelectMoveAction.cpp
index bee880be88c418135939da8a01c0ee9336eaa792..5631e69856f166b930cb1fb7023eb97987ff2e97 100644 (file)
--- a/src/battle/states/SelectMoveAction.cpp
+++ b/src/battle/states/SelectMoveAction.cpp
@@ -83,7 +83,7 @@ void SelectMoveAction::Render(SDL_Surface *screen) {
 void SelectMoveAction::RenderMenu(SDL_Surface *screen, const Vector<int> &offset) {
        Point<int> position(
                        (battle->BackgroundWidth() - battle->GetMoveMenu().Width()) / 2,
-                       (battle->BackgroundHeight() * 3 / 4) - (battle->GetMoveMenu().Height() / 2));
+                       battle->BackgroundHeight() - battle->GetMoveMenu().Height() - battle->GetMoveMenu().Height() / 2);
        battle->GetMoveMenu().Render(screen, position + offset);
 }
 

diff --git a/test-data/battle-bg.png b/test-data/battle-bg.png
index 7913872523873eae69fc05593e99e77de140d5fb..4c8a0af8c950c94171545143cd2db725ecacbd1d 100644 (file)
Binary files a/test-data/battle-bg.png and b/test-data/battle-bg.png differ