From 8caa879a520617f9d0557b11814ff354eeeef975 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Horv=C3=A1th=20Istv=C3=A1n?= <dzctir@inf.elte.hu>
Date: Wed, 27 Apr 2022 12:53:02 +0200
Subject: [PATCH] Tweak element heights on simulation UI
---
Assets/UI/Simulation/BattleUI/BattleUI.uxml | 4 ++--
Assets/UI/Simulation/TowerPlacing/TowerPlacingUI.uxml | 4 ++--
Assets/UI/Simulation/UnitDeployment/UnitDeploymentUI.uxml | 4 ++--
3 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/Assets/UI/Simulation/BattleUI/BattleUI.uxml b/Assets/UI/Simulation/BattleUI/BattleUI.uxml
index 69e6b00..2a9ae70 100644
--- a/Assets/UI/Simulation/BattleUI/BattleUI.uxml
+++ b/Assets/UI/Simulation/BattleUI/BattleUI.uxml
@@ -6,7 +6,7 @@
<ui:VisualElement name="VisualElement" class="ContainerStyle">
<ui:VisualElement class="ColumnContainer">
<ui:VisualElement name="GameView" class="GameViewStyle" />
- <ui:VisualElement name="BottomPanel" class="BottomPanelStyle" style="align-items: stretch; justify-content: space-between; flex-direction: row; height: 120px; background-color: rgba(238, 238, 238, 0.15);">
+ <ui:VisualElement name="BottomPanel" class="BottomPanelStyle" style="align-items: stretch; justify-content: space-between; flex-direction: row; height: 135px; background-color: rgba(238, 238, 238, 0.15); flex-shrink: 0;">
<ui:VisualElement style="flex-direction: row; flex-grow: 1;">
<ui:VisualElement name="PlayerRedOverallStats" style="flex-grow: 1; height: 100%; padding-left: 12px; padding-right: 12px;">
<ui:Label text="Player Red Stats" display-tooltip-when-elided="true" style="flex-shrink: 1; font-size: 18px; -unity-font-style: bold;" />
@@ -52,7 +52,7 @@
</ui:VisualElement>
</ui:VisualElement>
</ui:ScrollView>
- <ui:VisualElement name="ButtonContainer" class="NextButtonStyle" style="flex-grow: 0; flex-shrink: 0; position: relative; left: auto; right: auto; bottom: auto; border-left-color: rgb(0, 0, 0); border-right-color: rgb(0, 0, 0); border-top-color: rgb(0, 0, 0); border-bottom-color: rgb(0, 0, 0); border-top-width: 0; border-left-width: 0; height: 155px; border-right-width: 0; border-bottom-width: 0;">
+ <ui:VisualElement name="ButtonContainer" class="NextButtonStyle" style="flex-grow: 0; flex-shrink: 0; position: relative; left: auto; right: auto; bottom: auto; border-left-color: rgb(0, 0, 0); border-right-color: rgb(0, 0, 0); border-top-color: rgb(0, 0, 0); border-bottom-color: rgb(0, 0, 0); border-top-width: 0; border-left-width: 0; height: 175px; border-right-width: 0; border-bottom-width: 0;">
<ui:Button text="PAUSE" display-tooltip-when-elided="true" name="Pause" class="button" style="bottom: auto; position: relative; border-top-left-radius: 8px; border-bottom-left-radius: 8px; border-top-right-radius: 8px; border-bottom-right-radius: 8px; margin-left: 12px; margin-right: 12px; margin-top: 12px; margin-bottom: 12px; flex-grow: 1; font-size: 32px; display: flex;" />
<ui:Button text="EXIT" display-tooltip-when-elided="true" name="Exit" class="button" style="bottom: auto; position: relative; border-top-left-radius: 8px; border-bottom-left-radius: 8px; border-top-right-radius: 8px; border-bottom-right-radius: 8px; margin-left: 12px; margin-right: 12px; margin-top: 12px; margin-bottom: 12px; flex-grow: 1; font-size: 32px; display: none;" />
</ui:VisualElement>
diff --git a/Assets/UI/Simulation/TowerPlacing/TowerPlacingUI.uxml b/Assets/UI/Simulation/TowerPlacing/TowerPlacingUI.uxml
index c732f1e..8cbf9ae 100644
--- a/Assets/UI/Simulation/TowerPlacing/TowerPlacingUI.uxml
+++ b/Assets/UI/Simulation/TowerPlacing/TowerPlacingUI.uxml
@@ -5,7 +5,7 @@
<ui:VisualElement name="VisualElement" class="ContainerStyle">
<ui:VisualElement class="ColumnContainer">
<ui:VisualElement name="GameView" class="GameViewStyle" />
- <ui:VisualElement name="BottomPanel" class="BottomPanelStyle" style="flex-shrink: 0; height: 75px;" />
+ <ui:VisualElement name="BottomPanel" class="BottomPanelStyle" style="flex-shrink: 0; height: 135px;" />
</ui:VisualElement>
<ui:VisualElement name="TopPanel" class="TopPanelStyle">
<ui:ScrollView scroll-deceleration-rate="0,135" elasticity="0,1" vertical-scroller-visibility="Hidden" horizontal-scroller-visibility="Hidden" style="flex-grow: 1; padding-left: 8px; padding-right: 8px; padding-top: 8px; padding-bottom: 8px;">
@@ -41,7 +41,7 @@
<ui:Label text="Select a tower type to place" display-tooltip-when-elided="true" name="InstructionsText" style="white-space: normal; display: none;" />
</ui:VisualElement>
</ui:ScrollView>
- <ui:VisualElement name="NextButtonContainer" class="NextButtonStyle" style="left: auto; right: auto; bottom: auto; flex-direction: row; align-items: stretch; justify-content: space-around; flex-grow: 0; position: relative; flex-shrink: 0; height: 155px;">
+ <ui:VisualElement name="NextButtonContainer" class="NextButtonStyle" style="left: auto; right: auto; bottom: auto; flex-direction: row; align-items: stretch; justify-content: space-around; flex-grow: 0; position: relative; flex-shrink: 0; height: 175px;">
<ui:Button text="NEXT" display-tooltip-when-elided="true" name="Next" class="button" style="border-top-left-radius: 8px; border-bottom-left-radius: 8px; border-top-right-radius: 8px; border-bottom-right-radius: 8px; margin-left: 12px; margin-right: 12px; margin-top: 12px; margin-bottom: 12px; flex-grow: 1; font-size: 32px;" />
</ui:VisualElement>
</ui:VisualElement>
diff --git a/Assets/UI/Simulation/UnitDeployment/UnitDeploymentUI.uxml b/Assets/UI/Simulation/UnitDeployment/UnitDeploymentUI.uxml
index 46e68e3..b3dc478 100644
--- a/Assets/UI/Simulation/UnitDeployment/UnitDeploymentUI.uxml
+++ b/Assets/UI/Simulation/UnitDeployment/UnitDeploymentUI.uxml
@@ -4,10 +4,10 @@
<ui:VisualElement name="VisualElement" class="ContainerStyle">
<ui:VisualElement class="ColumnContainer">
<ui:VisualElement name="GameView" class="GameViewStyle" />
- <ui:VisualElement name="BottomPanel" class="BottomPanelStyle" style="flex-shrink: 0; height: 75px;" />
+ <ui:VisualElement name="BottomPanel" class="BottomPanelStyle" style="flex-shrink: 0; height: 135px;" />
</ui:VisualElement>
<ui:VisualElement name="TopPanel" class="TopPanelStyle" style="flex-shrink: 0; padding-left: 8px; padding-right: 8px; padding-top: 8px; padding-bottom: 8px;">
- <ui:VisualElement name="NextButtonContainer" class="NextButtonStyle buttons" style="flex-shrink: 0; height: 155px;">
+ <ui:VisualElement name="NextButtonContainer" class="NextButtonStyle buttons" style="flex-shrink: 0; height: 175px;">
<ui:Button text="NEXT" display-tooltip-when-elided="true" name="Next" class="button" style="bottom: auto; position: relative; border-top-left-radius: 8px; border-bottom-left-radius: 8px; border-top-right-radius: 8px; border-bottom-right-radius: 8px; margin-left: 12px; margin-right: 12px; margin-top: 12px; margin-bottom: 12px; flex-grow: 1; font-size: 32px; background-color: rgba(255, 255, 255, 0.75);" />
</ui:VisualElement>
<ui:Label text="Deploy Units" display-tooltip-when-elided="true" class="TitleStyle" />
--
GitLab