Give the minimap 20px more on eack side and remove the ugly overlay. Also cleanup some nearby code.

This was SVN commit r14580.
This commit is contained in:
JoshuaJB 2014-01-14 03:25:12 +00:00
parent 2ca0a20f81
commit 0f56dceef2
2 changed files with 65 additions and 69 deletions

View File

@ -878,7 +878,8 @@
hidden="true"
>
<object name="unitHeroButton" size="0 0 50 50" type="button" style="iconButton"
tooltip_style="sessionToolTip" tooltip="Attack and Armor">
tooltip_style="sessionToolTip" tooltip="Attack and Armor"
>
<object name="unitHeroImage" size="5 5 100%-5 100%-5" type="image" ghost="true"/>
<object name="heroHitOverlay" hidden="true" type="image" ghost="true" size="5 5 100%-5 100%-5"/>
</object>
@ -903,7 +904,8 @@
>
<repeat count="10">
<object name="unitGroupButton[n]" size="0 0 36 36" type="button" hidden="false" style="iconButton" tooltip_style="sessionToolTipBottomBold"
tooltip="Click to select grouped units, double-click to focus the grouped units and right-click to disband the group.">
tooltip="Click to select grouped units, double-click to focus the grouped units and right-click to disband the group."
>
<object name="unitGroupIcon[n]" size="3 3 33 33" type="image" sprite="groupsIcon" ghost="true"/>
<object name="unitGroupLabel[n]" type="text" style="largeCenteredOutlinedText" ghost="true"/>
</object>
@ -911,8 +913,8 @@
</object>
<!-- ================================ ================================ -->
<!-- Information tooltip
Follows the mouse around if 'independent' is set to 'true'. -->
<!-- Information tooltip -->
<!-- Follows the mouse around if 'independent' is set to 'true'. -->
<!-- ================================ ================================ -->
<object name="informationTooltip" type="tooltip" independent="true" style="informationTooltip"/>
@ -939,13 +941,11 @@
>
<object name="minimap"
type="minimap"
size="14 14 100%-14 100%-14"
size="4 4 100%-4 100%-4"
>
<action on="WorldClick">handleMinimapEvent(arguments[0]);</action>
</object>
<object name="minimapOverlay" size="10 10 100%-10 100%-10" type="image" sprite="stretched:session/minimap_circle.png" ghost="true"/>
<!-- Idle Worker Button -->
<object type="image"
size="100%-36 4 100%-4 36"
@ -968,9 +968,7 @@
<!-- ================================ ================================ -->
<object size="50%-304 100%-170 50%-110 100%" name="supplementalSelectionDetails" type="image" sprite="supplementalDetailsPanel" z="20">
<object name="unitFormationPanel"
size="24 12 100% 100%"
>
<object name="unitFormationPanel" size="24 12 100% 100%">
<object size="0 0 100% 100%">
<repeat count="16">
<object name="unitFormationButton[n]" hidden="true" style="iconButton" type="button" size="0 0 36 36" tooltip_style="sessionToolTipBottomBold" z="100">
@ -981,9 +979,7 @@
</object>
</object>
<object name="unitGarrisonPanel"
size="24 12 100% 100%"
>
<object name="unitGarrisonPanel" size="24 12 100% 100%">
<object size="0 0 100% 100%">
<repeat count="12">
<object name="unitGarrisonButton[n]" hidden="true" style="iconButton" type="button" size="0 0 36 36" tooltip_style="sessionToolTipBottomBold" z="100">