dallasgroot/0ad
1
0
Fork 0
mirror of https://gitea.wildfiregames.com/0ad/0ad synced 2026-06-16 05:13:58 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Fix element positions after new font rendering

Browse source 
This fixes the positions of elements which changed as part of
734386ce9f.
This commit is contained in:
Dunedan 2025-05-17 08:55:57 +02:00
parent 7b4cf11e25
commit 52ee6ad470
No known key found for this signature in database
GPG key ID: 885B16854284E0B2
14 changed files with 27 additions and 25 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
binaries/data/mods/mod/gui/common/modern/styles.xml
View file

@ -69,7 +69,7 @@
sprite2="ModernDropDownArrow"
sprite2_disabled="ModernDropDownArrowDisabled"
sprite2_pressed="ModernDropDownArrowHighlight"
buffer_zone="8"
buffer_zone="5"
dropdown_size="440"
minimum_visible_items="3"
sprite_list="GrayBackground"

14
binaries/data/mods/public/gui/common/setup.xml
View file

@ -27,7 +27,7 @@
<tooltip name="snToolTip"
anchor="top"
buffer_zone="4"
buffer_zone="3"
delay="500"
font="sans-14"
maxwidth="400"
@ -38,7 +38,7 @@
<tooltip name="snToolTipBottom"
anchor="bottom"
buffer_zone="4"
buffer_zone="3"
delay="500"
font="sans-14"
maxwidth="400"
@ -49,7 +49,7 @@
<tooltip name="sessionToolTip"
anchor="top"
buffer_zone="4"
buffer_zone="3"
delay="100"
font="sans-14"
maxwidth="400"
@ -60,7 +60,7 @@
<tooltip name="sessionToolTipInstantly"
anchor="top"
buffer_zone="4"
buffer_zone="3"
delay="0"
font="sans-14"
maxwidth="400"
@ -71,7 +71,7 @@
<tooltip name="sessionToolTipBottom"
anchor="bottom"
buffer_zone="4"
buffer_zone="3"
delay="100"
font="sans-14"
maxwidth="400"
@ -82,7 +82,7 @@
<tooltip name="sessionToolTipBold"
anchor="top"
buffer_zone="4"
buffer_zone="3"
delay="100"
font="sans-bold-14"
maxwidth="400"
@ -93,7 +93,7 @@
<tooltip name="sessionToolTipBottomBold"
anchor="bottom"
buffer_zone="4"
buffer_zone="3"
delay="100"
font="sans-bold-14"
maxwidth="400"

12
binaries/data/mods/public/gui/common/sprites.xml
View file

@ -151,7 +151,7 @@
<effect add_color="237 227 167"/>
<image
texture="global/icon/info.png"
size="0 3 100% 100%+3"
size="0 0 100% 100%"
/>
</sprite>
@ -159,7 +159,7 @@
<effect add_color="255 255 255"/>
<image
texture="global/icon/info.png"
size="0 3 100% 100%+3"
size="0 0 100% 100%"
/>
</sprite>
@ -167,7 +167,7 @@
<effect add_color="237 227 167"/>
<image
texture="global/icon/reset.png"
size="0 3 100% 100%+3"
size="0 0 100% 100%"
/>
</sprite>
@ -175,7 +175,7 @@
<effect add_color="255 255 255"/>
<image
texture="global/icon/reset.png"
size="0 3 100% 100%+3"
size="0 0 100% 100%"
/>
</sprite>
@ -183,7 +183,7 @@
<effect add_color="237 227 167"/>
<image
texture="global/icon/bubble.png"
size="0 3 100% 100%+3"
size="0 0 100% 100%"
/>
</sprite>
@ -191,7 +191,7 @@
<effect add_color="255 255 255"/>
<image
texture="global/icon/bubble.png"
size="0 3 100% 100%+3"
size="0 0 100% 100%"
/>
</sprite>

6
binaries/data/mods/public/gui/gamesetup/Pages/GameSetupPage/GameSettings/PerPlayer/PlayersPanel.xml
View file

@ -18,14 +18,14 @@
<translatableAttribute id="caption">Civilization</translatableAttribute>
</object>
<object name="civInfoButton" type="button" style="IconButton" sprite="iconInfoGold" sprite_over="iconInfoWhite" size="85%-37 0 85%-21 16"/>
<object name="civResetButton" type="button" style="IconButton" sprite="iconResetGold" sprite_over="iconResetWhite" size="85%-16 0 85% 16"/>
<object name="civInfoButton" type="button" style="IconButton" sprite="iconInfoGold" sprite_over="iconInfoWhite" size="85%-37 4 85%-21 20"/>
<object name="civResetButton" type="button" style="IconButton" sprite="iconResetGold" sprite_over="iconResetWhite" size="85%-16 4 85% 20"/>
<object name="playerTeamHeading" type="text" style="ModernLabelText" size="85%+5 0 100%-21 100%">
<translatableAttribute id="caption">Team</translatableAttribute>
</object>
<object name="teamResetButton" type="button" style="IconButton" sprite="iconResetGold" sprite_over="iconResetWhite" size="100%-21 0 100%-5 16" />
<object name="teamResetButton" type="button" style="IconButton" sprite="iconResetGold" sprite_over="iconResetWhite" size="100%-21 4 100%-5 20" />
</object>
<object size="1 36 100%-1 100%">

1
binaries/data/mods/public/gui/gamesetup/Pages/GameSetupPage/Panels/Buttons/LobbyButton.xml
View file

@ -8,4 +8,5 @@
z="100"
sprite="iconBubbleGold"
sprite_over="iconBubbleWhite"
size="0 9 100% 100%+9"
/>

2
binaries/data/mods/public/gui/pregame/ProjectInformation.xml
View file

@ -4,7 +4,7 @@
<object type="image" style="TranslucentPanelThinBorder" size="8 100%-368 100%-8 100%-94">
<object name="productDescription" font="sans-14" type="text" textcolor="white" size="8 8 100%-8 100%-36" ghost="true"/>
<object name="productDescription" font="sans-14" type="text" textcolor="white" size="8 4 100%-8 100%-36" ghost="true" buffer_zone="5"/>
<object name="communityButtons">
<repeat count="10">

1
binaries/data/mods/public/gui/pregame/styles.xml
View file

@ -19,6 +19,7 @@
textcolor="white"
scrollbar="true"
scrollbar_style="ModernScrollBar"
buffer_zone="0"
/>
</styles>

2
binaries/data/mods/public/gui/pregame/userreport/userreport.xml
View file

@ -5,7 +5,7 @@
<action on="Load">initUserReport();</action>
<action on="Tick">updateUserReportStatus();</action>
<object type="text" name="userReportText" style="userReportText" size="2 2 100%-2 100%-44"/>
<object type="text" name="userReportText" style="userReportText" size="7 3 100%-5 100%-44"/>
<object type="button" name="userReportEnableButton" style="StoneButton" tooltip_style="pgToolTip" size="8 100%-40 151 100%-8"/>
<object type="button" name="userReportTermsButton" style="StoneButton" size="100%-151 100%-40 100%-8 100%-8"/>

2
binaries/data/mods/public/gui/reference/civinfo/setup.xml
View file

@ -3,7 +3,7 @@
<setup>
<tooltip name="civInfoTooltip"
anchor="top"
buffer_zone="10"
buffer_zone="6"
delay="50"
font="sans-12"
textcolor="white"

2
binaries/data/mods/public/gui/reference/tips/sections/TipDisplay.js
View file

@ -131,7 +131,7 @@ class TipDisplay
this.tipTitle.caption = tipText.shift();
this.scaleGuiElementsToFit();
this.tipText.caption = tipText.map(text =>
text && "[icon=\"BulletPoint\"] " + text).join("\n\n");
text && "[icon=\"BulletPoint\" displace=\"0 -3\"] " + text).join("\n\n");
}
updateTipImage()

2
binaries/data/mods/public/gui/session/top_panel/Counters.xml
View file

@ -6,7 +6,7 @@
<object name="resource[n]" size="0 0 73 100%" type="button" style="resourceCounter" tooltip_style="sessionToolTip">
<object size="2 0 38 36" type="image" name="resource[n]_icon" ghost="true"/>
<object size="33 4 180 22" type="text" style="resourceText" name="resource[n]_count"/>
<object size="33 1 200 34" type="text" style="gathererCounts" name="resource[n]_stats"/>
<object size="33 20 200 38" type="text" style="gathererCounts" name="resource[n]_stats"/>
</object>
</repeat>
</object>

2
binaries/data/mods/public/gui/session/trade/BarterPanel.xml
View file

@ -30,7 +30,7 @@
</object>
<object name="barterHelp" type="button" size="100%-24 50%-12 100% 50%+12" style="StoneButton" tooltip_style="sessionToolTipBold" enabled="false">
<object type="image" size="20% 15% 80% 75%" sprite="iconInfoWhite" ghost="true"/>
<object type="image" size="20% 20% 80% 80%" sprite="iconInfoWhite" ghost="true"/>
</object>
</object>

2
binaries/data/mods/public/gui/session/trade/TradePanel.xml
View file

@ -35,7 +35,7 @@
</object>
<object name="tradeHelp" type="button" size="100%-24 4 100% 28" style="StoneButton" tooltip_style="sessionToolTipBold" enabled="false">
<object type="image" size="20% 15% 80% 75%" sprite="iconInfoWhite" ghost="true"/>
<object type="image" size="20% 20% 80% 80%" sprite="iconInfoWhite" ghost="true"/>
</object>
</object>

2
binaries/data/mods/public/gui/summary/summary.xml
View file

@ -166,7 +166,7 @@
type="button"
sprite="iconBubbleGold"
sprite_over="iconBubbleWhite"
size="100%-436 100%-45 100%-420 100%-29"
size="100%-436 100%-42 100%-420 100%-26"
z="50"
hotkey="lobby"
>