From 76ee903d84d5b477016fb6ed6bdee1a21e237903 Mon Sep 17 00:00:00 2001 From: Vojtech Bocek Date: Sun, 7 Sep 2014 15:01:56 +0200 Subject: Add support for TrueType fonts * Keeps original font system in place * Uses the same API as original font system: - You can render only one line at a time - You can only use one font and color for one gr_text* call * Caches all rendered text, with a string cache limited to 400 entries, then it trucates to 250, which results in memory usage hovering around 5-10MB Change-Id: I36107b9dcd8d57bae4486fce8b8f64e49ef3d906 Signed-off-by: Vojtech Bocek --- gui/devices/1024x600/res/ui.xml | 2 +- gui/devices/1024x768/res/ui.xml | 2 +- gui/devices/1080x1920/res/ui.xml | 6 +++--- gui/devices/1200x1920/res/ui.xml | 6 +++--- gui/devices/1280x800/res/ui.xml | 2 +- gui/devices/1440x2560/res/ui.xml | 6 +++--- gui/devices/1600x2560/res/ui.xml | 6 +++--- gui/devices/1920x1200/res/ui.xml | 2 +- gui/devices/240x240/res/ui.xml | 6 +++--- gui/devices/2560x1600/res/ui.xml | 2 +- gui/devices/280x280/res/ui.xml | 6 +++--- gui/devices/320x320/res/ui.xml | 6 +++--- gui/devices/320x480/res/ui.xml | 6 +++--- gui/devices/480x800/res/ui.xml | 6 +++--- gui/devices/480x854/res/ui.xml | 6 +++--- gui/devices/540x960/res/ui.xml | 6 +++--- gui/devices/720x1280/res/ui.xml | 6 +++--- gui/devices/800x1280/res/ui.xml | 6 +++--- gui/devices/800x480/res/ui.xml | 2 +- .../common/res/fonts/RobotoCondensed-Regular.ttf | Bin 0 -> 125332 bytes 20 files changed, 45 insertions(+), 45 deletions(-) create mode 100644 gui/devices/common/res/fonts/RobotoCondensed-Regular.ttf (limited to 'gui/devices') diff --git a/gui/devices/1024x600/res/ui.xml b/gui/devices/1024x600/res/ui.xml index 87248a686..4d6f3178f 100644 --- a/gui/devices/1024x600/res/ui.xml +++ b/gui/devices/1024x600/res/ui.xml @@ -14,7 +14,7 @@ - + diff --git a/gui/devices/1024x768/res/ui.xml b/gui/devices/1024x768/res/ui.xml index 407e18b31..29f169089 100644 --- a/gui/devices/1024x768/res/ui.xml +++ b/gui/devices/1024x768/res/ui.xml @@ -14,7 +14,7 @@ - + diff --git a/gui/devices/1080x1920/res/ui.xml b/gui/devices/1080x1920/res/ui.xml index 0d547a6e9..95c48a513 100644 --- a/gui/devices/1080x1920/res/ui.xml +++ b/gui/devices/1080x1920/res/ui.xml @@ -14,9 +14,9 @@ - - - + + + diff --git a/gui/devices/1200x1920/res/ui.xml b/gui/devices/1200x1920/res/ui.xml index 0778692c7..428880d76 100644 --- a/gui/devices/1200x1920/res/ui.xml +++ b/gui/devices/1200x1920/res/ui.xml @@ -14,9 +14,9 @@ - - - + + + diff --git a/gui/devices/1280x800/res/ui.xml b/gui/devices/1280x800/res/ui.xml index bfb1a3a3a..6f6c2bd36 100644 --- a/gui/devices/1280x800/res/ui.xml +++ b/gui/devices/1280x800/res/ui.xml @@ -14,7 +14,7 @@ - + diff --git a/gui/devices/1440x2560/res/ui.xml b/gui/devices/1440x2560/res/ui.xml index ae25d33c8..fe55dfdbf 100644 --- a/gui/devices/1440x2560/res/ui.xml +++ b/gui/devices/1440x2560/res/ui.xml @@ -14,9 +14,9 @@ - - - + + + diff --git a/gui/devices/1600x2560/res/ui.xml b/gui/devices/1600x2560/res/ui.xml index 9703881e3..8561b2ddf 100644 --- a/gui/devices/1600x2560/res/ui.xml +++ b/gui/devices/1600x2560/res/ui.xml @@ -14,9 +14,9 @@ - - - + + + diff --git a/gui/devices/1920x1200/res/ui.xml b/gui/devices/1920x1200/res/ui.xml index d8d8a7d5b..3e8c9f13f 100644 --- a/gui/devices/1920x1200/res/ui.xml +++ b/gui/devices/1920x1200/res/ui.xml @@ -14,7 +14,7 @@ - + diff --git a/gui/devices/240x240/res/ui.xml b/gui/devices/240x240/res/ui.xml index 4cc25dd87..294e5951b 100644 --- a/gui/devices/240x240/res/ui.xml +++ b/gui/devices/240x240/res/ui.xml @@ -14,9 +14,9 @@ - - - + + + diff --git a/gui/devices/2560x1600/res/ui.xml b/gui/devices/2560x1600/res/ui.xml index ca0d8838e..cb0c12e1f 100644 --- a/gui/devices/2560x1600/res/ui.xml +++ b/gui/devices/2560x1600/res/ui.xml @@ -14,7 +14,7 @@ - + diff --git a/gui/devices/280x280/res/ui.xml b/gui/devices/280x280/res/ui.xml index 5a705a0e9..99532edcb 100644 --- a/gui/devices/280x280/res/ui.xml +++ b/gui/devices/280x280/res/ui.xml @@ -14,9 +14,9 @@ - - - + + + diff --git a/gui/devices/320x320/res/ui.xml b/gui/devices/320x320/res/ui.xml index a9be8c985..f66852942 100644 --- a/gui/devices/320x320/res/ui.xml +++ b/gui/devices/320x320/res/ui.xml @@ -14,9 +14,9 @@ - - - + + + diff --git a/gui/devices/320x480/res/ui.xml b/gui/devices/320x480/res/ui.xml index 57baf5ff3..cccd5b3b4 100644 --- a/gui/devices/320x480/res/ui.xml +++ b/gui/devices/320x480/res/ui.xml @@ -14,9 +14,9 @@ - - - + + + diff --git a/gui/devices/480x800/res/ui.xml b/gui/devices/480x800/res/ui.xml index aad982291..940ad4333 100644 --- a/gui/devices/480x800/res/ui.xml +++ b/gui/devices/480x800/res/ui.xml @@ -14,9 +14,9 @@ - - - + + + diff --git a/gui/devices/480x854/res/ui.xml b/gui/devices/480x854/res/ui.xml index ea0cf77cd..dce1d8843 100644 --- a/gui/devices/480x854/res/ui.xml +++ b/gui/devices/480x854/res/ui.xml @@ -14,9 +14,9 @@ - - - + + + diff --git a/gui/devices/540x960/res/ui.xml b/gui/devices/540x960/res/ui.xml index 58d6c9df6..37c3e26d5 100644 --- a/gui/devices/540x960/res/ui.xml +++ b/gui/devices/540x960/res/ui.xml @@ -14,9 +14,9 @@ - - - + + + diff --git a/gui/devices/720x1280/res/ui.xml b/gui/devices/720x1280/res/ui.xml index f44998f66..a7ff19285 100644 --- a/gui/devices/720x1280/res/ui.xml +++ b/gui/devices/720x1280/res/ui.xml @@ -14,9 +14,9 @@ - - - + + + diff --git a/gui/devices/800x1280/res/ui.xml b/gui/devices/800x1280/res/ui.xml index b074931b6..e0036bfc5 100644 --- a/gui/devices/800x1280/res/ui.xml +++ b/gui/devices/800x1280/res/ui.xml @@ -14,9 +14,9 @@ - - - + + + diff --git a/gui/devices/800x480/res/ui.xml b/gui/devices/800x480/res/ui.xml index 0ee0e94fc..9acb7a112 100644 --- a/gui/devices/800x480/res/ui.xml +++ b/gui/devices/800x480/res/ui.xml @@ -14,7 +14,7 @@ - + diff --git a/gui/devices/common/res/fonts/RobotoCondensed-Regular.ttf b/gui/devices/common/res/fonts/RobotoCondensed-Regular.ttf new file mode 100644 index 000000000..b9fc49c95 Binary files /dev/null and b/gui/devices/common/res/fonts/RobotoCondensed-Regular.ttf differ -- cgit v1.2.3