Increase height of middle panel to prevent icon overflow
The icon/portrait of the middle panel when a single entity was selected was very subtly (4 px) overflowing its lane and invading that of the entity's name. This change fixes that by: - Raising the top of the middle panel by 4 px to leave room for the portrait/icon. This avoids having to shrink it and lose quality. - Distributing the 4 px of difference in height in the statistics area by lowering 1 px the top bar, 1 px the middle bar (if any), and 3 px the bottom bar (if any). The rest of the elements are lowered 4 px, and therefore remain in the same place. - Increasing the height of the minimap panel by 4 px so that it remains aligned with the middle panel, vertically centering the minimap, and making the necessary adjustments to the position of its buttons. Additionally, a couple of minor changes are applied: - The separators between the statistics area and the attack/resistance and resources area, and between the attack/resistance and resources area and the entity name area, which had different heights, are set to the same height/thickness. - The attack/resistance icon, which was very close to the entity icon/portrait, is moved 1 px to the right, and the resourceCarryingText (in the same area), which was very far from the resourceCarryingIcon, is also moved 3 px to the right. Fixes #7029
This commit is contained in:
parent
b15eb6909e
commit
668ae8a20e
@ -16,7 +16,7 @@
|
|||||||
<!-- Background circle -->
|
<!-- Background circle -->
|
||||||
<object
|
<object
|
||||||
type="image"
|
type="image"
|
||||||
size="4 4 100%-4 100%-4"
|
size="4 6 100%-4 100%-6"
|
||||||
sprite="stretched:session/minimap_circle_modern.png"
|
sprite="stretched:session/minimap_circle_modern.png"
|
||||||
ghost="true"
|
ghost="true"
|
||||||
/>
|
/>
|
||||||
@ -24,7 +24,7 @@
|
|||||||
<!-- Idle Worker Button -->
|
<!-- Idle Worker Button -->
|
||||||
<object name="idleWorkerButton"
|
<object name="idleWorkerButton"
|
||||||
type="button"
|
type="button"
|
||||||
size="100%-119 100%-120 100%-4 100%-5"
|
size="100%-119 100%-121 100%-4 100%-6"
|
||||||
tooltip_style="sessionToolTip"
|
tooltip_style="sessionToolTip"
|
||||||
hotkey="selection.idleworker"
|
hotkey="selection.idleworker"
|
||||||
sprite="stretched:session/minimap-idle.png"
|
sprite="stretched:session/minimap-idle.png"
|
||||||
@ -45,7 +45,7 @@
|
|||||||
<!-- Diplomacy Colors Button -->
|
<!-- Diplomacy Colors Button -->
|
||||||
<object name="diplomacyColorsButton"
|
<object name="diplomacyColorsButton"
|
||||||
type="button"
|
type="button"
|
||||||
size="4 100%-120 119 100%-5"
|
size="3 100%-121 118 100%-6"
|
||||||
tooltip_style="sessionToolTip"
|
tooltip_style="sessionToolTip"
|
||||||
hotkey="session.diplomacycolors"
|
hotkey="session.diplomacycolors"
|
||||||
/>
|
/>
|
||||||
@ -54,7 +54,7 @@
|
|||||||
<object
|
<object
|
||||||
name="flareButton"
|
name="flareButton"
|
||||||
type="button"
|
type="button"
|
||||||
size="3 3 118 118"
|
size="2 4 117 119"
|
||||||
tooltip_style="sessionToolTip"
|
tooltip_style="sessionToolTip"
|
||||||
hotkey="session.flareactivate"
|
hotkey="session.flareactivate"
|
||||||
sprite="stretched:session/minimap-flare.png"
|
sprite="stretched:session/minimap-flare.png"
|
||||||
@ -66,7 +66,7 @@
|
|||||||
<!-- MiniMap -->
|
<!-- MiniMap -->
|
||||||
<object
|
<object
|
||||||
name="minimap"
|
name="minimap"
|
||||||
size="8 8 100%-8 100%-8"
|
size="8 10 100%-8 100%-10"
|
||||||
type="minimap"
|
type="minimap"
|
||||||
mask="true"
|
mask="true"
|
||||||
flare_texture_count="16"
|
flare_texture_count="16"
|
||||||
|
@ -5,7 +5,7 @@
|
|||||||
>
|
>
|
||||||
|
|
||||||
<!-- Names and civilization emblem etc. (This must come before the attack and resistance icon to avoid clipping issues.) -->
|
<!-- Names and civilization emblem etc. (This must come before the attack and resistance icon to avoid clipping issues.) -->
|
||||||
<object size="0 92 100% 100%" name="statsArea" type="image" sprite="edgedPanelShader">
|
<object size="0 96 100% 100%" name="statsArea" type="image" sprite="edgedPanelShader">
|
||||||
<!-- Civilization tooltip. -->
|
<!-- Civilization tooltip. -->
|
||||||
<object size="0 38 100% 62" tooltip_style="sessionToolTip">
|
<object size="0 38 100% 62" tooltip_style="sessionToolTip">
|
||||||
<!-- Civilization emblem. -->
|
<!-- Civilization emblem. -->
|
||||||
@ -26,14 +26,14 @@
|
|||||||
</object>
|
</object>
|
||||||
|
|
||||||
<!-- Stats Bars -->
|
<!-- Stats Bars -->
|
||||||
<object size= "0 0 100% 96" type="image" tooltip_style="sessionToolTip">
|
<object size= "0 0 100% 100" type="image" tooltip_style="sessionToolTip">
|
||||||
|
|
||||||
<object size="0 0 100% 60" type="image" sprite="topEdgedPanelShader">
|
<object size="0 0 100% 65" type="image" sprite="topEdgedPanelShader">
|
||||||
|
|
||||||
<!-- Placeholders storing the position for the bars. -->
|
<!-- Placeholders storing the position for the bars. -->
|
||||||
<object size="96 1 100% 24" name="sectionPosTop" hidden="true"/>
|
<object size="96 2 100% 24" name="sectionPosTop" hidden="true"/>
|
||||||
<object size="96 11 100% 34" name="sectionPosMiddle" hidden="true"/>
|
<object size="96 12 100% 34" name="sectionPosMiddle" hidden="true"/>
|
||||||
<object size="96 32 100% 55" name="sectionPosBottom" hidden="true"/>
|
<object size="96 35 100% 55" name="sectionPosBottom" hidden="true"/>
|
||||||
|
|
||||||
<!-- Capture bar -->
|
<!-- Capture bar -->
|
||||||
<object name="captureSection">
|
<object name="captureSection">
|
||||||
@ -78,15 +78,15 @@
|
|||||||
</object>
|
</object>
|
||||||
</object>
|
</object>
|
||||||
|
|
||||||
<object size="0 59 100% 95" type="image" sprite="edgedPanelShader">
|
<object size="0 63 100% 98" type="image" sprite="edgedPanelShader">
|
||||||
<!-- Attack and Resistance -->
|
<!-- Attack and Resistance -->
|
||||||
<object size="96 0 128 32" name="attackAndResistanceStats" type="image" sprite="stretched:session/icons/stances/defensive.png" tooltip_style="sessionToolTipInstantly">
|
<object size="97 0 129 32" name="attackAndResistanceStats" type="image" sprite="stretched:session/icons/stances/defensive.png" tooltip_style="sessionToolTipInstantly">
|
||||||
<translatableAttribute id="tooltip">Attack and Resistance</translatableAttribute>
|
<translatableAttribute id="tooltip">Attack and Resistance</translatableAttribute>
|
||||||
</object>
|
</object>
|
||||||
|
|
||||||
<!-- Resource carrying icon/counter -->
|
<!-- Resource carrying icon/counter -->
|
||||||
<!-- Used also for number of gatherers/builders -->
|
<!-- Used also for number of gatherers/builders -->
|
||||||
<object size="100%-96 0 100%-36 32" type="text" name="resourceCarryingText" style="CarryingTextRight"/>
|
<object size="100%-96 0 100%-33 32" type="text" name="resourceCarryingText" style="CarryingTextRight"/>
|
||||||
<object size="100%-32 0 100% 32" type="image" name="resourceCarryingIcon" tooltip_style="sessionToolTip"/>
|
<object size="100%-32 0 100% 32" type="image" name="resourceCarryingIcon" tooltip_style="sessionToolTip"/>
|
||||||
</object>
|
</object>
|
||||||
|
|
||||||
|
@ -79,7 +79,7 @@
|
|||||||
<!-- Limit to the minimal supported width of 1024 pixels. -->
|
<!-- Limit to the minimal supported width of 1024 pixels. -->
|
||||||
<object size="50%-512 0 50%+512 100%">
|
<object size="50%-512 0 50%+512 100%">
|
||||||
|
|
||||||
<object size="50%-512 100%-200 50%-312 100%">
|
<object size="50%-512 100%-204 50%-312 100%">
|
||||||
<include file="gui/session/minimap/MiniMap.xml"/>
|
<include file="gui/session/minimap/MiniMap.xml"/>
|
||||||
</object>
|
</object>
|
||||||
|
|
||||||
@ -95,7 +95,7 @@
|
|||||||
|
|
||||||
<!-- Selection Details Panel (middle). -->
|
<!-- Selection Details Panel (middle). -->
|
||||||
<object name="selectionDetails"
|
<object name="selectionDetails"
|
||||||
size="50%-114 100%-200 50%+114 100%"
|
size="50%-114 100%-204 50%+114 100%"
|
||||||
sprite="selectionDetailsPanel"
|
sprite="selectionDetailsPanel"
|
||||||
type="image"
|
type="image"
|
||||||
>
|
>
|
||||||
|
Loading…
Reference in New Issue
Block a user