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

Enabled Lato for GUI1 and adjusted assigned sizes accordingly

Browse source 
Since GUI1 widgets seem to rely on the given font size values in font.hpp
for their dimensions, those are unchanged. ThemeWML-provided sizes were adjusted,
and larger sizes assigned to elements that were too small with the new font.

Theme element rects were also adjusted as necessary.
This commit is contained in:
Charles Dang 2016-05-18 08:04:20 +11:00
parent cbb73708fb
commit 52cba5fc63
6 changed files with 34 additions and 34 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
data/hardwired/fonts.cfg
View file

@ -4,7 +4,7 @@
# This is marked as translatable, to allow translators to
# provide different font orders: one just has to install the
# missing fonts without needing to change the gmo files
order=_ "DejaVuSans.ttf,Andagii.ttf,DroidSansJapanese.ttf,DroidSansFallbackFull.ttf,Junicode-Regular.ttf"
order=_ "Lato-Regular.ttf,DejaVuSans.ttf,Andagii.ttf,DroidSansJapanese.ttf,DroidSansFallbackFull.ttf,Junicode-Regular.ttf"
family_order=_ "Lato"
# Used by GUI2 only, hence no [font] blocks for these. The font files are

2
data/themes/_initial.cfg
View file

@ -415,7 +415,7 @@
id=report_timeout
font_size={FONT_SMALL_SIZE}
ref=time-icon
rect="+0,=,+65,+20"
rect="+0,=-2,+65,+20"
xanchor=fixed
yanchor=fixed
[/report_countdown]

42
data/themes/default.cfg
View file

@ -7,22 +7,22 @@
# http://www.wesnoth.org/forum/viewtopic.php?p=213708#213708
#define DEFAULT_FONT_NORMAL
14#enddef
17#enddef
#define DEFAULT_FONT_SMALL
12#enddef
15#enddef
#define DEFAULT_FONT_TINY
10#enddef
13#enddef
#define DEFAULT_FONT_REALLYTINY
9#enddef
11#enddef
#define DEFAULT_FONT_NORMAL_HEIGHT
18#enddef
22#enddef
#define DEFAULT_FONT_SMALL_HEIGHT
16#enddef
19#enddef
#define DEFAULT_FONT_TINY_HEIGHT
14#enddef
17#enddef
#define DEFAULT_FONT_REALLYTINY_HEIGHT
13#enddef
15#enddef
#define FONT_RGB_LEVEL1
245,230,193#enddef
@ -222,21 +222,21 @@
id=status-position
font_size={DEFAULT_FONT_SMALL}
ref=terrain-info-box-center
rect="=+2,=+0,+95,+16"
rect="=+2,=-2,+95,+16"
xanchor=right
yanchor=fixed
[/position]
[terrain_info]
id=status-terrain
rect="+2,=-1,+70,+16"
rect="+2,=+1,+70,+16"
xanchor=right
yanchor=fixed
[/terrain_info]
[terrain]
id=terrain-description
ref=terrain-description-box-center
rect="=+1,=+1,+165,+16"
font_size={DEFAULT_FONT_REALLYTINY}
rect="=+1,=-1,+165,+16"
font_size={DEFAULT_FONT_TINY}
xanchor=right
yanchor=fixed
[/terrain]
@ -287,7 +287,7 @@
[turn]
id=turn
font_size={DEFAULT_FONT_SMALL}
rect="+4,=,+55,+16"
rect="+4,=-2,+55,+16"
xanchor=fixed
yanchor=fixed
prefix="" #wmllint: ignore
@ -297,7 +297,7 @@
id=gold
font_size={DEFAULT_FONT_SMALL}
ref=gold-icon
rect="+4,=,+55,+16"
rect="+4,=-2,+55,+16"
xanchor=fixed
yanchor=fixed
prefix="" #wmllint: ignore
@ -307,7 +307,7 @@
id=villages
font_size={DEFAULT_FONT_SMALL}
ref=villages-icon
rect="+4,=,+55,+16"
rect="+4,=-2,+55,+16"
xanchor=fixed
yanchor=fixed
prefix="" #wmllint: ignore
@ -317,7 +317,7 @@
id=num-units
font_size={DEFAULT_FONT_SMALL}
ref=units-icon
rect="+4,=,+55,+16"
rect="+4,=-2,+55,+16"
xanchor=fixed
yanchor=fixed
prefix="" #wmllint: ignore
@ -327,7 +327,7 @@
id=status-upkeep
font_size={DEFAULT_FONT_SMALL}
ref=upkeep-icon
rect="+4,=,+50,+16"
rect="+4,=-2,+50,+16"
xanchor=fixed
yanchor=fixed
prefix="" #wmllint: ignore
@ -337,7 +337,7 @@
id=status-income
font_size={DEFAULT_FONT_SMALL}
ref=income-icon
rect="+4,=,+60,+16"
rect="+4,=-2,+60,+16"
xanchor=fixed
yanchor=fixed
prefix="" #wmllint: ignore
@ -441,7 +441,7 @@
[/unit_vision]
[unit_hp]
id=unit-hp
font_size={DEFAULT_FONT_SMALL}
font_size={DEFAULT_FONT_TINY}
ref=label-hp
rect="=,+0,+94,+14"
prefix_literal=" "
@ -450,7 +450,7 @@
[/unit_hp]
[unit_xp]
id=unit-xp
font_size={DEFAULT_FONT_SMALL}
font_size={DEFAULT_FONT_TINY}
ref=label-xp
rect="=,+0,=,+14"
prefix_literal=" "
@ -460,7 +460,7 @@
[unit_moves]
ref=label-mp
id=unit-moves
font_size={DEFAULT_FONT_SMALL}
font_size={DEFAULT_FONT_TINY}
rect="=,+0,=,+16"
prefix_literal=" "
xanchor=right

18
data/themes/editor.cfg
View file

@ -12,13 +12,13 @@
hidden=yes
#define DEFAULT_EDITOR_FONT_NORMAL
14 #enddef
17 #enddef
#define DEFAULT_EDITOR_FONT_SMALL
12 #enddef
15 #enddef
#define DEFAULT_EDITOR_FONT_TINY
10 #enddef
13 #enddef
#define DEFAULT_EDITOR_FONT_REALLYTINY
9 #enddef
11 #enddef
############################################### 1024x768 ######################################################
[resolution]
@ -838,21 +838,21 @@
id=status-position
font_size={DEFAULT_EDITOR_FONT_SMALL}
ref=terrain-info-box-center
rect="=+2,=+0,+95,+16"
rect="=+2,=-2,+95,+16"
xanchor=right
yanchor=fixed
[/position]
[terrain_info]
id=status-terrain
rect="+2,=-1,+70,+16"
rect="+2,=+1,+70,+16"
xanchor=right
yanchor=fixed
[/terrain_info]
[terrain]
id=terrain-description
ref=terrain-description-box-center
rect="=+1,=+1,+165,+16"
font_size={DEFAULT_EDITOR_FONT_REALLYTINY}
rect="=+1,=-1,+165,+16"
font_size={DEFAULT_EDITOR_FONT_TINY}
xanchor=right
yanchor=fixed
[/terrain]
@ -897,7 +897,7 @@
id=num-units
font_size={DEFAULT_EDITOR_FONT_SMALL}
ref=units-icon
rect="+4,=,+55,+16"
rect="+4,=-2,+55,+16"
xanchor=fixed
yanchor=fixed
prefix="" #wmllint: ignore

2
src/help/help_impl.cpp
View file

@ -77,7 +77,7 @@ const int max_section_level = 15;
const int title_size = font::SIZE_LARGE;
const int title2_size = font::SIZE_15;
const int box_width = 2;
const int normal_font_size = font::SIZE_SMALL;
const int normal_font_size = font::SIZE_NORMAL;
const unsigned max_history = 100;
const std::string topic_img = "help/topic.png";
const std::string closed_section_img = "help/closed_section.png";

2
src/widgets/button.cpp
View file

@ -39,7 +39,7 @@ static lg::log_domain log_display("display");
namespace gui {
const int font_size = font::SIZE_SMALL;
const int font_size = font::SIZE_NORMAL;
const int horizontal_padding = font::SIZE_SMALL;
const int checkbox_horizontal_padding = font::SIZE_SMALL / 2;
const int vertical_padding = font::SIZE_SMALL / 2;