summaryrefslogtreecommitdiff
path: root/src/displayapp
diff options
context:
space:
mode:
Diffstat (limited to 'src/displayapp')
-rw-r--r--src/displayapp/fonts/CMakeLists.txt4
-rw-r--r--src/displayapp/fonts/fonts.json4
-rw-r--r--src/displayapp/fonts/jetbrains_mono_i.c41
-rw-r--r--src/displayapp/screens/settings/QuickSettings.cpp4
4 files changed, 27 insertions, 26 deletions
diff --git a/src/displayapp/fonts/CMakeLists.txt b/src/displayapp/fonts/CMakeLists.txt
index 84830cc0..5946d917 100644
--- a/src/displayapp/fonts/CMakeLists.txt
+++ b/src/displayapp/fonts/CMakeLists.txt
@@ -1,6 +1,6 @@
set(FONTS jetbrains_mono_42 jetbrains_mono_76 jetbrains_mono_bold_20
- jetbrains_mono_extrabold_compressed lv_font_navi_80 lv_font_sys_48
- open_sans_light)
+ jetbrains_mono_i jetbrains_mono_extrabold_compressed lv_font_navi_80
+ lv_font_sys_48 open_sans_light)
find_program(LV_FONT_CONV "lv_font_conv" NO_CACHE REQUIRED
HINTS "${CMAKE_SOURCE_DIR}/node_modules/.bin")
message(STATUS "Using ${LV_FONT_CONV} to generate font files")
diff --git a/src/displayapp/fonts/fonts.json b/src/displayapp/fonts/fonts.json
index 884bb71f..a87a9d3d 100644
--- a/src/displayapp/fonts/fonts.json
+++ b/src/displayapp/fonts/fonts.json
@@ -38,11 +38,11 @@
"sources": [
{
"file": "JetBrainsMono-Regular.ttf",
- "symbols": "i"
+ "range": "0x69"
}
],
"bpp": 1,
- "size": 52
+ "size": 48
},
"jetbrains_mono_extrabold_compressed": {
"sources": [
diff --git a/src/displayapp/fonts/jetbrains_mono_i.c b/src/displayapp/fonts/jetbrains_mono_i.c
index 41e7735e..ab1c4869 100644
--- a/src/displayapp/fonts/jetbrains_mono_i.c
+++ b/src/displayapp/fonts/jetbrains_mono_i.c
@@ -1,7 +1,7 @@
/*******************************************************************************
- * Size: 52 px
+ * Size: 48 px
* Bpp: 1
- * Opts: --size 52 --output jetbrains_mono_i.c --bpp 1 --format lvgl --no-compress --font JetBrainsMono-Regular.ttf --symbols i
+ * Opts: --size 48 --output jetbrains_mono_i.c --bpp 1 --format lvgl --no-compress --font JetBrainsMono-Regular.ttf --range 0x69
******************************************************************************/
#ifdef LV_LVGL_H_INCLUDE_SIMPLE
@@ -23,21 +23,20 @@
/*Store the image of the glyphs*/
static LV_ATTRIBUTE_LARGE_CONST const uint8_t glyph_bitmap[] = {
/* U+0069 "i" */
- 0x0, 0x7c, 0x0, 0x0, 0xfe, 0x0, 0x0, 0xfe,
- 0x0, 0x0, 0xfe, 0x0, 0x0, 0xfe, 0x0, 0x0,
- 0x7c, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0,
- 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0,
- 0x0, 0x0, 0x0, 0x0, 0x7f, 0xfe, 0x0, 0x7f,
- 0xfe, 0x0, 0x7f, 0xfe, 0x0, 0x7f, 0xfe, 0x0,
- 0x0, 0x3e, 0x0, 0x0, 0x3e, 0x0, 0x0, 0x3e,
- 0x0, 0x0, 0x3e, 0x0, 0x0, 0x3e, 0x0, 0x0,
- 0x3e, 0x0, 0x0, 0x3e, 0x0, 0x0, 0x3e, 0x0,
- 0x0, 0x3e, 0x0, 0x0, 0x3e, 0x0, 0x0, 0x3e,
- 0x0, 0x0, 0x3e, 0x0, 0x0, 0x3e, 0x0, 0x0,
- 0x3e, 0x0, 0x0, 0x3e, 0x0, 0x0, 0x3e, 0x0,
- 0x0, 0x3e, 0x0, 0x0, 0x3e, 0x0, 0x0, 0x3e,
- 0x0, 0x0, 0x3e, 0x0, 0xff, 0xff, 0xff, 0xff,
- 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff
+ 0x0, 0x7c, 0x0, 0x1, 0xfc, 0x0, 0x3, 0xf8,
+ 0x0, 0x7, 0xf0, 0x0, 0xf, 0xe0, 0x0, 0xf,
+ 0x80, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0,
+ 0x0, 0x0, 0x0, 0x0, 0x1, 0xff, 0xf0, 0x3,
+ 0xff, 0xe0, 0x7, 0xff, 0xc0, 0xf, 0xff, 0x80,
+ 0x0, 0xf, 0x0, 0x0, 0x1e, 0x0, 0x0, 0x3c,
+ 0x0, 0x0, 0x78, 0x0, 0x0, 0xf0, 0x0, 0x1,
+ 0xe0, 0x0, 0x3, 0xc0, 0x0, 0x7, 0x80, 0x0,
+ 0xf, 0x0, 0x0, 0x1e, 0x0, 0x0, 0x3c, 0x0,
+ 0x0, 0x78, 0x0, 0x0, 0xf0, 0x0, 0x1, 0xe0,
+ 0x0, 0x3, 0xc0, 0x0, 0x7, 0x80, 0x0, 0xf,
+ 0x0, 0x0, 0x1e, 0x0, 0x0, 0x3c, 0x1, 0xff,
+ 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+ 0xff, 0xff, 0xe0
};
@@ -47,7 +46,7 @@ static LV_ATTRIBUTE_LARGE_CONST const uint8_t glyph_bitmap[] = {
static const lv_font_fmt_txt_glyph_dsc_t glyph_dsc[] = {
{.bitmap_index = 0, .adv_w = 0, .box_w = 0, .box_h = 0, .ofs_x = 0, .ofs_y = 0} /* id = 0 reserved */,
- {.bitmap_index = 0, .adv_w = 499, .box_w = 24, .box_h = 40, .ofs_x = 4, .ofs_y = 0}
+ {.bitmap_index = 0, .adv_w = 461, .box_w = 23, .box_h = 37, .ofs_x = 4, .ofs_y = 0}
};
/*---------------------
@@ -105,14 +104,14 @@ lv_font_t jetbrains_mono_i = {
#endif
.get_glyph_dsc = lv_font_get_glyph_dsc_fmt_txt, /*Function pointer to get glyph's data*/
.get_glyph_bitmap = lv_font_get_bitmap_fmt_txt, /*Function pointer to get glyph's bitmap*/
- .line_height = 40, /*The maximum line height required by the font*/
+ .line_height = 37, /*The maximum line height required by the font*/
.base_line = 0, /*Baseline measured from the bottom of the line*/
#if !(LVGL_VERSION_MAJOR == 6 && LVGL_VERSION_MINOR == 0)
.subpx = LV_FONT_SUBPX_NONE,
#endif
#if LV_VERSION_CHECK(7, 4, 0) || LVGL_VERSION_MAJOR >= 8
- .underline_position = -8,
- .underline_thickness = 3,
+ .underline_position = -7,
+ .underline_thickness = 2,
#endif
.dsc = &font_dsc /*The custom font data. Will be accessed by `get_glyph_bitmap/dsc` */
};
diff --git a/src/displayapp/screens/settings/QuickSettings.cpp b/src/displayapp/screens/settings/QuickSettings.cpp
index fd12f160..1facd024 100644
--- a/src/displayapp/screens/settings/QuickSettings.cpp
+++ b/src/displayapp/screens/settings/QuickSettings.cpp
@@ -72,6 +72,7 @@ QuickSettings::QuickSettings(Pinetime::Applications::DisplayApp* app,
lv_obj_set_style_local_text_font(btn1_lvl, LV_LABEL_PART_MAIN, LV_STATE_DEFAULT, &lv_font_sys_48);
lv_label_set_text_static(btn1_lvl, brightness.GetIcon());
+//
btn2 = lv_btn_create(lv_scr_act(), nullptr);
btn2->user_data = this;
lv_obj_set_event_cb(btn2, ButtonEventHandler);
@@ -81,8 +82,9 @@ QuickSettings::QuickSettings(Pinetime::Applications::DisplayApp* app,
lv_obj_t* lbl_btn;
lbl_btn = lv_label_create(btn2, nullptr);
- // lv_obj_set_style_local_text_font(lbl_btn, LV_LABEL_PART_MAIN, LV_STATE_DEFAULT, &jetbrains_mono_i);
+ lv_obj_set_style_local_text_font(lbl_btn, LV_LABEL_PART_MAIN, LV_STATE_DEFAULT, &jetbrains_mono_i);
lv_label_set_text_static(lbl_btn, "i");
+//
btn3 = lv_btn_create(lv_scr_act(), nullptr);
btn3->user_data = this;
generated by cgit v1.2.3 (git 2.39.1) at 2024-09-20 07:21:19 +0000