0ct0pu5/wesnoth
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Removed empty space from the top panel...

Browse source 
...to give space for the terrain description and generally reworked
the placement. The top panel in the 800x600 theme should now look much
better too.
This commit is contained in:
Lari Nieminen 2008-03-15 12:31:06 +00:00
parent fea178c276
commit f0dbcd7825
2 changed files with 94 additions and 45 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

133
data/themes/default.cfg
View file

@ -164,42 +164,42 @@
image=themes/status-bg.png
ref=actions-menu
rect="+5,=+1,+80,+19"
xanchor=proportional
xanchor=fixed
yanchor=fixed
[/panel]
[panel]
id=gold-panel
image=themes/status-bg.png
rect="+5,=,+71,="
xanchor=proportional
xanchor=fixed
yanchor=fixed
[/panel]
[panel]
id=villages-panel
image=themes/status-bg.png
rect="+5,=,+71,="
xanchor=proportional
xanchor=fixed
yanchor=fixed
[/panel]
[panel]
id=units-panel
image=themes/status-bg.png
rect="+5,=,+71,="
xanchor=proportional
xanchor=fixed
yanchor=fixed
[/panel]
[panel]
id=upkeep-panel
image=themes/status-bg.png
rect="+5,=,+80,="
xanchor=proportional
xanchor=fixed
yanchor=fixed
[/panel]
[panel]
id=income-panel
image=themes/status-bg.png
rect="+5,=,+80,="
xanchor=proportional
xanchor=fixed
yanchor=fixed
[/panel]
@ -231,7 +231,7 @@
text= _ "gold"
ref=gold-panel
rect="=+5,=+1,+17,+17"
xanchor=proportional
xanchor=fixed
yanchor=fixed
[/label]
[label]
@ -240,7 +240,7 @@
text= _ "villages"
ref=villages-panel
rect="=+5,=+1,+17,+17"
xanchor=proportional
xanchor=fixed
yanchor=fixed
[/label]
[label]
@ -249,7 +249,7 @@
text= _ "units"
ref=units-panel
rect="=+5,=+1,+17,+17"
xanchor=proportional
xanchor=fixed
yanchor=fixed
[/label]
[label]
@ -258,7 +258,7 @@
text= _ "upkeep"
ref=upkeep-panel
rect="=+5,=+1,+25,+17"
xanchor=proportional
xanchor=fixed
yanchor=fixed
[/label]
[label]
@ -267,7 +267,7 @@
text= _ "income"
ref=income-panel
rect="=+5,=+1,+25,+17"
xanchor=proportional
xanchor=fixed
yanchor=fixed
[/label]
@ -286,7 +286,7 @@
id=icon-sideplaying
ref=turn-panel
rect="=+3,=+2,+25,+17"
xanchor=proportional
xanchor=fixed
yanchor=fixed
[/side_playing]
@ -295,7 +295,7 @@
id=turn
font_size={DEFAULT_FONT_SMALL}
rect="+4,=,+55,+16"
xanchor=proportional
xanchor=fixed
yanchor=fixed
prefix=
prefix_literal=""
@ -305,7 +305,7 @@
font_size={DEFAULT_FONT_SMALL}
ref=gold-icon
rect="+4,=,+55,+16"
xanchor=proportional
xanchor=fixed
yanchor=fixed
prefix=
prefix_literal=""
@ -315,7 +315,7 @@
font_size={DEFAULT_FONT_SMALL}
ref=villages-icon
rect="+4,=,+55,+16"
xanchor=proportional
xanchor=fixed
yanchor=fixed
prefix=
prefix_literal=""
@ -325,7 +325,7 @@
font_size={DEFAULT_FONT_SMALL}
ref=units-icon
rect="+4,=,+55,+16"
xanchor=proportional
xanchor=fixed
yanchor=fixed
prefix=
prefix_literal=""
@ -335,7 +335,7 @@
font_size={DEFAULT_FONT_SMALL}
ref=upkeep-icon
rect="+4,=,+40,+16"
xanchor=proportional
xanchor=fixed
yanchor=fixed
prefix=
prefix_literal=""
@ -345,7 +345,7 @@
font_size={DEFAULT_FONT_SMALL}
ref=income-icon
rect="+4,=,+40,+16"
xanchor=proportional
xanchor=fixed
yanchor=fixed
prefix=
prefix_literal=""
@ -353,28 +353,40 @@
{COUNTDOWN_THEME_STATUS {DEFAULT_FONT_SMALL}}
# This panel encloses the location information displays and the
# observer icon. This separate container is used so that we can
# make the terrain name display stretch to fill all available space
# so that the long strings don't get cut off as easily.
[panel]
id=terrain-panel
rect="+0,=,1024,="
xanchor=left
yanchor=fixed
[/panel]
# The size of these rectangles only accommodates hex coordinates
# up to 99. If either is over that maximum the movement cost will
# be pushed off the right end.
[terrain]
id=status-terrain
font_size={DEFAULT_FONT_SMALL}
rect="+10,=,+115,+16"
xanchor=proportional
yanchor=fixed
[/terrain]
[position]
id=status-position
font_size={DEFAULT_FONT_SMALL}
rect="+5,=,+95,+16"
xanchor=proportional
ref=terrain-panel
rect="=+15,=,+95,="
xanchor=fixed
yanchor=fixed
[/position]
[terrain]
id=status-terrain
font_size={DEFAULT_FONT_SMALL}
ref=terrain-panel
rect="=+115,=,=-24,="
xanchor=left
yanchor=fixed
[/terrain]
[observers]
id=observers
font_size={DEFAULT_FONT_SMALL}
rect="+4,=-1,+16,+16"
rect="+4,=,+16,+16"
xanchor=right
yanchor=fixed
[/observers]
@ -562,34 +574,71 @@
# fix top pane at 800x600
[change]
id=turn-panel
rect="+65,=+1,+100,+19"
rect="+5,=+1,+80,+19"
[/change]
[change]
id=gold-panel
rect="+5,=,+61,="
[/change]
[change]
id=villages-panel
rect="+5,=,+61,="
[/change]
[change]
id=units-panel
rect="+5,=,+55,="
[/change]
[change]
id=upkeep-panel
rect="+5,=,+100,="
rect="+5,=,+80,="
[/change]
[change]
id=income-panel
rect="+5,=,+89,="
rect="+5,=,+55,="
[/change]
[change]
id=turn
rect="+4,=,+55,+16"
font_size={DEFAULT_FONT_TINY}
[/change]
[change]
id=gold
rect="+4,=,+45,+16"
font_size={DEFAULT_FONT_TINY}
[/change]
[change]
id=villages
rect="+4,=,+45,+16"
font_size={DEFAULT_FONT_TINY}
[/change]
[change]
id=num-units
rect="+4,=,+45,+16"
font_size={DEFAULT_FONT_TINY}
[/change]
[change]
id=status-upkeep
rect="+4,=,+55,+17"
rect="+4,=,+40,+16"
font_size={DEFAULT_FONT_TINY}
[/change]
[change]
id=status-income
rect="+3,=,+45,+17"
rect="+4,=,+30,+16"
font_size={DEFAULT_FONT_TINY}
[/change]
[change]
id=timeout-panel
rect="+5,=,+55,="
[/change]
[change]
id=report_timeout
font_size={DEFAULT_FONT_TINY}
rect="+0,=,+35,+20"
[/change]
[remove]
id=status-terrain
[/remove]
[change]
id=status-position
rect="+3,=,+125,+16"
[/change]
[change]
id=observers
rect="+6,=-1,+16,+16"
rect="=+5,=,+80,="
font_size={DEFAULT_FONT_TINY}
[/change]
[/partialresolution]

6
data/themes/macros.cfg
View file

@ -4,7 +4,7 @@
id=timeout-panel
image=themes/status-bg.png
rect="+5,=,+70,="
xanchor=proportional
xanchor=fixed
yanchor=fixed
[/panel]
[label]
@ -13,7 +13,7 @@
icon=themes/sand-clock.png
ref=timeout-panel
rect="=+5,=+1,+17,+17"
xanchor=proportional
xanchor=fixed
yanchor=fixed
[/label]
#enddef
@ -24,7 +24,7 @@
font_size={FONT_SMALL_SIZE}
ref=time-icon
rect="+0,=,+50,+20"
xanchor=proportional
xanchor=fixed
yanchor=fixed
[/report_countdown]
#enddef