will/InfiniTime
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Now that i have room, larger vulf mono font

Browse Source
This commit is contained in:
Ryan Rix 2023-09-26 12:15:04 -07:00
parent 1eb624c452
commit 92f8c37291
4 changed files with 28 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/displayapp/fonts/CMakeLists.txt
View File

@ -1,6 +1,6 @@
set(FONTS jetbrains_mono_42 jetbrains_mono_76 jetbrains_mono_bold_20 set(FONTS jetbrains_mono_42 jetbrains_mono_76 jetbrains_mono_bold_20
jetbrains_mono_extrabold_compressed lv_font_sys_48 jetbrains_mono_extrabold_compressed lv_font_sys_48
open_sans_light fontawesome_weathericons) open_sans_light fontawesome_weathericons vulf_mono_italic)
find_program(LV_FONT_CONV "lv_font_conv" NO_CACHE REQUIRED find_program(LV_FONT_CONV "lv_font_conv" NO_CACHE REQUIRED
HINTS "${CMAKE_SOURCE_DIR}/node_modules/.bin") HINTS "${CMAKE_SOURCE_DIR}/node_modules/.bin")
message(STATUS "Using ${LV_FONT_CONV} to generate font files") message(STATUS "Using ${LV_FONT_CONV} to generate font files")

42
src/displayapp/fonts/fonts.json
View File

@ -1,22 +1,28 @@
{ {
"jetbrains_mono_bold_20": { "jetbrains_mono_bold_20": {
"sources": [ "sources": [
{ {
"file": "Vulf_Mono-Italic.woff", "file": "JetBrainsMono-Bold.ttf",
"range": "0x20-0x7e, 0xB0" "range": "0x20-0x7e, 0xB0, 0x410-0x44f"
}, },
{ {
"file": "JetBrainsMono-Bold.ttf", "file": "FontAwesome5-Solid+Brands+Regular.woff",
"range": "0x410-0x44f" "range": "0xf294, 0xf242, 0xf54b, 0xf21e, 0xf1e6, 0xf017, 0xf129, 0xf03a, 0xf185, 0xf560, 0xf001, 0xf3fd, 0xf1fc, 0xf45d, 0xf59f, 0xf5a0, 0xf027, 0xf028, 0xf6a9, 0xf04b, 0xf04c, 0xf048, 0xf051, 0xf095, 0xf3dd, 0xf04d, 0xf2f2, 0xf024, 0xf252, 0xf569, 0xf06e, 0xf015, 0xf00c"
}, }
{ ],
"file": "FontAwesome5-Solid+Brands+Regular.woff", "bpp": 1,
"range": "0xf294, 0xf242, 0xf54b, 0xf21e, 0xf1e6, 0xf017, 0xf129, 0xf03a, 0xf185, 0xf560, 0xf001, 0xf3fd, 0xf1fc, 0xf45d, 0xf59f, 0xf5a0, 0xf027, 0xf028, 0xf6a9, 0xf04b, 0xf04c, 0xf048, 0xf051, 0xf095, 0xf3dd, 0xf04d, 0xf2f2, 0xf024, 0xf252, 0xf569, 0xf06e, 0xf015, 0xf00c" "size": 20
} },
], "vulf_mono_italic": {
"bpp": 1, "sources": [
"size": 20 {
}, "file": "Vulf_Mono-Italic.woff",
"range": "0x20-0x7e, 0xB0"
}
],
"bpp": 1,
"size": 30
},
"jetbrains_mono_42": { "jetbrains_mono_42": {
"sources": [ "sources": [
{ {

2
src/displayapp/screens/WatchFaceFuzzy.cpp
View File

@ -36,7 +36,7 @@ WatchFaceFuzzy::WatchFaceFuzzy(Controllers::DateTime& dateTimeController,
lv_obj_align(notificationIcon, nullptr, LV_ALIGN_IN_TOP_LEFT, 0, 0); lv_obj_align(notificationIcon, nullptr, LV_ALIGN_IN_TOP_LEFT, 0, 0);
label_time = lv_label_create(lv_scr_act(), nullptr); label_time = lv_label_create(lv_scr_act(), nullptr);
lv_obj_set_style_local_text_font(label_time, LV_LABEL_PART_MAIN, LV_STATE_DEFAULT, &jetbrains_mono_bold_20); lv_obj_set_style_local_text_font(label_time, LV_LABEL_PART_MAIN, LV_STATE_DEFAULT, &vulf_mono_italic);
lv_obj_align(label_time, lv_scr_act(), LV_ALIGN_IN_LEFT_MID, 0, -20); lv_obj_align(label_time, lv_scr_act(), LV_ALIGN_IN_LEFT_MID, 0, -20);
lv_label_set_recolor(label_time, true); lv_label_set_recolor(label_time, true);

2
src/displayapp/screens/WatchFaceFuzzy.h
View File

@ -10,6 +10,8 @@
#include "displayapp/widgets/StatusIcons.h" #include "displayapp/widgets/StatusIcons.h"
#include "utility/DirtyValue.h" #include "utility/DirtyValue.h"
extern lv_font_t vulf_mono_italic;
namespace Pinetime { namespace Pinetime {
namespace Controllers { namespace Controllers {
class Battery; class Battery;