add support for a resolution of 800x480...
...(only possible to use if --enable-small-gui is set at configure time), it is not active by default because several places are currently rather broken (mp creation/lobby, load dialog and preferences show many glitches), there is currently no support in the editor for such a low resolution fix support of 800x600 be decreasing the minimap size when at a resolution below 1000x620 improve tinygui display
This commit is contained in:
Nils Kneuper
parent
8fc1d83434
commit
eb065b5e63
3 changed files with 125 additions and 30 deletions
BIN
data/core/images/themes/rightside-small.png
Normal file
BIN
data/core/images/themes/rightside-small.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 7.9 KiB |
|
|
@ -16,6 +16,8 @@
|
|||
12 #enddef
|
||||
#define DEFAULT_FONT_TINY
|
||||
10 #enddef
|
||||
#define DEFAULT_FONT_REALLYTINY
|
||||
9 #enddef
|
||||
|
||||
#define DEFAULT_FONT320_NORMAL
|
||||
8 #enddef
|
||||
|
|
@ -110,7 +112,7 @@
|
|||
id=menu-main
|
||||
title= _ "Menu"
|
||||
image=lite
|
||||
items=objectives,statistics,unitlist,separator,statustable,save,savereplay,savemap,load,preferences,chatlog,AUTOSAVES,help,quit
|
||||
items=objectives,statistics,unitlist,statustable,save,savereplay,savemap,load,preferences,chatlog,AUTOSAVES,help,quit
|
||||
ref=top-panel
|
||||
rect="=+3,=+1,+100,=-4"
|
||||
xanchor=fixed
|
||||
|
|
@ -464,7 +466,7 @@
|
|||
id=unit-weapons
|
||||
font_size={DEFAULT_FONT_SMALL}
|
||||
ref=unit-moves
|
||||
rect="=,+0,=,594"
|
||||
rect="=,+0,=,730"
|
||||
xanchor=right
|
||||
yanchor=fixed
|
||||
[/unit_weapons]
|
||||
|
|
@ -481,11 +483,21 @@
|
|||
{REPLAY_THEME DEFAULT_FONT_SMALL}
|
||||
[/resolution]
|
||||
|
||||
# make sure not to use those if tinygui is set, otherwise it will look strange (it will look strange starting at 1024x768 this way)
|
||||
#ifdef TINY
|
||||
#else
|
||||
[partialresolution]
|
||||
id=1000x600
|
||||
id=1000x620
|
||||
inherits=1024x768
|
||||
width=1000
|
||||
height=600
|
||||
height=620
|
||||
# adjust allowed heigth for displaying weapon stuff, otherwise the weapon names might appear on top of the end turn button
|
||||
[change]
|
||||
id=unit-weapons
|
||||
ref=unit-moves
|
||||
font_size={DEFAULT_FONT_SMALL}
|
||||
rect="=,+0,=,585"
|
||||
[/change]
|
||||
[/partialresolution]
|
||||
|
||||
[partialresolution]
|
||||
|
|
@ -494,16 +506,58 @@
|
|||
width=800
|
||||
height=600
|
||||
|
||||
# some changes to the display to have stuff look better on 800x600
|
||||
# using a right pane with a smaller minimap to achieve this
|
||||
# use backgound with 40px less for minimap
|
||||
[change]
|
||||
id=menu-main
|
||||
items=objectives,statistics,unitlist,statustable,save,savereplay,savemap,load,preferences,chatlog,AUTOSAVES,help,quit
|
||||
id=top-right-panel
|
||||
image=themes/rightside-small.png
|
||||
rect="+0,=+0,1024,+244"
|
||||
[/change]
|
||||
# increase size in middle panel since minimap is 40px smaller
|
||||
# give it additional 10px and move the end-turn button down
|
||||
[change]
|
||||
id=middle-right-panel
|
||||
rect="=,+0,=,+471"
|
||||
[/change]
|
||||
# reduce vertical size of minimap by 40px
|
||||
[change]
|
||||
id=mini-map
|
||||
rect="=+10,=+7,=-7,+103"
|
||||
[/change]
|
||||
# shift tod image up by 40px rel to 768px
|
||||
[change]
|
||||
id=image-tod
|
||||
rect="=+10,=+119,=-7,+39"
|
||||
[/change]
|
||||
# fixing this one fixes HP/XP/unit status
|
||||
[change]
|
||||
id=label-hp
|
||||
font_size={DEFAULT_FONT_TINY}
|
||||
rect="=+84,=+169,+54,+12"
|
||||
[/change]
|
||||
# shift unit image up by 40px rel to 768px
|
||||
[change]
|
||||
id=unit-image
|
||||
rect="=+9,=+175,+72,+72"
|
||||
[/change]
|
||||
[change]
|
||||
id=button-endturn
|
||||
rect="=+17,=+3,+80,+20"
|
||||
[/change]
|
||||
# adjust allowed heigth for displaying weapon stuff
|
||||
[change]
|
||||
id=unit-weapons
|
||||
ref=unit-moves
|
||||
font_size={DEFAULT_FONT_SMALL}
|
||||
rect="=,+0,=,575"
|
||||
[/change]
|
||||
|
||||
# fix top pane at 800x600
|
||||
[change]
|
||||
id=turn-panel
|
||||
rect="+65,=+1,+100,+19"
|
||||
[/change]
|
||||
|
||||
[change]
|
||||
id=upkeep-panel
|
||||
rect="+5,=,+100,="
|
||||
|
|
@ -512,7 +566,6 @@
|
|||
id=income-panel
|
||||
rect="+5,=,+89,="
|
||||
[/change]
|
||||
|
||||
[change]
|
||||
id=status-upkeep
|
||||
rect="+4,=,+55,+17"
|
||||
|
|
@ -521,16 +574,13 @@
|
|||
id=status-income
|
||||
rect="+3,=,+45,+17"
|
||||
[/change]
|
||||
|
||||
[remove]
|
||||
id=status-terrain
|
||||
[/remove]
|
||||
|
||||
[change]
|
||||
id=status-position
|
||||
rect="+3,=,+125,+16"
|
||||
[/change]
|
||||
|
||||
[change]
|
||||
id=observers
|
||||
rect="+6,=-1,+16,+16"
|
||||
|
|
@ -542,12 +592,59 @@
|
|||
inherits=800x600
|
||||
width=800
|
||||
height=480
|
||||
[remove]
|
||||
id=unit-race
|
||||
[/remove]
|
||||
|
||||
# use smaller fonts to display things correctly when using a vertical resolution smaller than 600px
|
||||
[change]
|
||||
id=mini-map
|
||||
rect="=+10,=+7,=-7,+103"
|
||||
id=unit-description
|
||||
font_size={DEFAULT_FONT_SMALL}
|
||||
rect="=+9,=+3,=-2,+16"
|
||||
[/change]
|
||||
[change]
|
||||
id=unit-type
|
||||
font_size={DEFAULT_FONT_REALLYTINY}
|
||||
rect="=,+0,=,+11"
|
||||
[/change]
|
||||
# placing the unit level left of the alignment
|
||||
# doing it the other way around leads to a strange problem sometimes having the alingment not being displayed
|
||||
# this does not happen with this order
|
||||
[change]
|
||||
id=unit-level
|
||||
font_size={DEFAULT_FONT_REALLYTINY}
|
||||
rect="=+72,+0,=,+11"
|
||||
[/change]
|
||||
[change]
|
||||
id=unit-alignment
|
||||
font_size={DEFAULT_FONT_REALLYTINY}
|
||||
rect="=-72,=,=,+11"
|
||||
[/change]
|
||||
[change]
|
||||
id=unit-traits
|
||||
font_size={DEFAULT_FONT_REALLYTINY}
|
||||
rect="=,+0,=,+11"
|
||||
[/change]
|
||||
[change]
|
||||
id=unit-abilities
|
||||
font_size={DEFAULT_FONT_REALLYTINY}
|
||||
rect="=,+0,=,+11"
|
||||
[/change]
|
||||
[change]
|
||||
id=unit-moves
|
||||
font_size={DEFAULT_FONT_REALLYTINY}
|
||||
rect="=,+0,=,+11"
|
||||
[/change]
|
||||
[change]
|
||||
id=unit-weapons
|
||||
font_size={DEFAULT_FONT_REALLYTINY}
|
||||
rect="=,+0,=,455"
|
||||
[/change]
|
||||
[/partialresolution]
|
||||
#endif
|
||||
|
||||
# Everything below is only relevant if tinygui is activated at compile time. Putting it into a #ifdef so that there is nothing to choke about if that is not the case
|
||||
#ifdef TINY
|
||||
[partialresolution]
|
||||
id=400x300
|
||||
width=400
|
||||
|
|
@ -620,12 +717,6 @@
|
|||
rect="=+14,=+3,+300,+14"
|
||||
[/change]
|
||||
|
||||
[change]
|
||||
id=status-terrain
|
||||
font_size={DEFAULT_FONT320_SMALL}
|
||||
rect="+10,=,+170,+12"
|
||||
[/change]
|
||||
|
||||
[change]
|
||||
id=turn-panel
|
||||
ref=top-panel
|
||||
|
|
@ -710,6 +801,7 @@
|
|||
[/change]
|
||||
# replay panel not wide enough, for the dirty hacks used see data/themes/macros.cfg
|
||||
|
||||
# adjust top bar
|
||||
[change]
|
||||
id=turn
|
||||
font_size={DEFAULT_FONT320_SMALL}
|
||||
|
|
@ -741,14 +833,20 @@
|
|||
rect="+10,=,+58,+8"
|
||||
[/change]
|
||||
[remove]
|
||||
id=status-terrain
|
||||
[/remove]
|
||||
[change]
|
||||
id=status-position
|
||||
font_size={DEFAULT_FONT320_SMALL}
|
||||
rect="+15,=,+200,+8"
|
||||
[/remove]
|
||||
rect="+10,=,+170,+12"
|
||||
[/change]
|
||||
|
||||
[remove]
|
||||
id=observers
|
||||
rect="+5,=,+8,+8"
|
||||
[/remove]
|
||||
|
||||
# adjust right pane
|
||||
[change]
|
||||
id=unit-image
|
||||
rect="=+5,=+92,+36,+36"
|
||||
|
|
@ -756,7 +854,7 @@
|
|||
[change]
|
||||
id=unit-description
|
||||
font_size={DEFAULT_FONT320_NORMAL}
|
||||
rect="=+6,=,=-2,+10"
|
||||
rect="=+6,=+2,=-2,+10"
|
||||
[/change]
|
||||
[change]
|
||||
id=unit-type
|
||||
|
|
@ -817,7 +915,6 @@
|
|||
|
||||
[/partialresolution]
|
||||
|
||||
|
||||
[partialresolution]
|
||||
id=320x240
|
||||
width=320
|
||||
|
|
@ -845,7 +942,7 @@
|
|||
[/change]
|
||||
|
||||
[remove]
|
||||
id=status-terrain
|
||||
id=status-position
|
||||
[/remove]
|
||||
|
||||
[change]
|
||||
|
|
@ -857,6 +954,7 @@
|
|||
rect="=+15,=,5,="
|
||||
[/change]
|
||||
|
||||
# replace endturn button at the buttom right with a tiny one at the top right
|
||||
[remove]
|
||||
id=button-endturn
|
||||
title= _ "short end-turn^E."
|
||||
|
|
@ -878,8 +976,5 @@
|
|||
[/add]
|
||||
|
||||
[/partialresolution]
|
||||
|
||||
|
||||
|
||||
|
||||
#endif
|
||||
[/theme]
|
||||
|
|
|
|||
|
|
@ -34,7 +34,7 @@
|
|||
id=main-map
|
||||
ref=top-panel
|
||||
#ifdef TINY
|
||||
rect="=,+16,+946,768"
|
||||
rect="=,+16,+953,768"
|
||||
#else
|
||||
rect="=,+26,+882,768"
|
||||
#endif
|
||||
|
|
@ -45,7 +45,7 @@
|
|||
image=themes/top-bg.png
|
||||
ref=top-panel
|
||||
#ifdef TINY
|
||||
rect="=,+0,+946,+16"
|
||||
rect="=,+0,+953,+16"
|
||||
#else
|
||||
rect="=,+0,+882,+26"
|
||||
#endif
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue