diff options
| author | Michele Bini <michele.bini@gmail.com> | 2022-03-25 15:53:13 (GMT) |
|---|---|---|
| committer | Michele Bini <michele.bini@gmail.com> | 2022-03-25 15:53:13 (GMT) |
| commit | 691fa334cd0660eb6a7663106a82b996dd1eada0 (patch) | |
| tree | f162f0c5212f2bf82dd446a57923e961be9a9d04 | |
| parent | 0d1d67d00715232e0a17e37a05c77bf83d50a2e2 (diff) | |
sans lv table, about ~140b saved
| -rw-r--r-- | src/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | src/displayapp/lv_pinetime_theme.c | 6 | ||||
| -rw-r--r-- | src/libs/lv_conf.h | 2 |
3 files changed, 7 insertions, 3 deletions
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index e55938b..622b7e0 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -264,7 +264,6 @@ set(LVGL_SRC libs/lvgl/src/lv_widgets/lv_spinbox.h libs/lvgl/src/lv_widgets/lv_spinner.h libs/lvgl/src/lv_widgets/lv_switch.h - libs/lvgl/src/lv_widgets/lv_table.h libs/lvgl/src/lv_widgets/lv_tabview.h libs/lvgl/src/lv_widgets/lv_textarea.h libs/lvgl/src/lv_widgets/lv_tileview.h @@ -351,7 +350,6 @@ set(LVGL_SRC libs/lvgl/src/lv_widgets/lv_spinbox.c libs/lvgl/src/lv_widgets/lv_spinner.c libs/lvgl/src/lv_widgets/lv_switch.c - libs/lvgl/src/lv_widgets/lv_table.c libs/lvgl/src/lv_widgets/lv_tabview.c libs/lvgl/src/lv_widgets/lv_textarea.c libs/lvgl/src/lv_widgets/lv_tileview.c diff --git a/src/displayapp/lv_pinetime_theme.c b/src/displayapp/lv_pinetime_theme.c index 4fce5d6..96332ed 100644 --- a/src/displayapp/lv_pinetime_theme.c +++ b/src/displayapp/lv_pinetime_theme.c @@ -50,7 +50,9 @@ static lv_style_t style_sw_knob; static lv_style_t style_arc_bg; static lv_style_t style_arc_knob; static lv_style_t style_arc_indic; +#ifdef LV_USE_TABLE static lv_style_t style_table_cell; +#endif static lv_style_t style_pad_small; static lv_style_t style_bg_grad; static lv_style_t style_lmeter; @@ -248,6 +250,7 @@ static void basic_init(void) { lv_style_set_bg_color(&style_arc_knob, LV_STATE_DEFAULT, LV_PINETIME_LIGHT_GRAY); lv_style_set_pad_all(&style_arc_knob, LV_STATE_DEFAULT, LV_DPX(5)); +#if LV_USE_TABLE style_init_reset(&style_table_cell); lv_style_set_border_color(&style_table_cell, LV_STATE_DEFAULT, LV_PINETIME_GRAY); lv_style_set_border_width(&style_table_cell, LV_STATE_DEFAULT, 1); @@ -256,6 +259,7 @@ static void basic_init(void) { lv_style_set_pad_right(&style_table_cell, LV_STATE_DEFAULT, 5); lv_style_set_pad_top(&style_table_cell, LV_STATE_DEFAULT, 2); lv_style_set_pad_bottom(&style_table_cell, LV_STATE_DEFAULT, 2); +#endif style_init_reset(&style_pad_small); lv_style_int_t pad_small_value = 10; @@ -496,6 +500,7 @@ static void theme_apply(lv_obj_t* obj, lv_theme_style_t name) { _lv_style_list_add_style(list, &style_scrollbar); break; +#if LV_USE_TABLE case LV_THEME_TABLE: list = lv_obj_get_style_list(obj, LV_TABLE_PART_BG); _lv_style_list_add_style(list, &style_bg); @@ -510,6 +515,7 @@ static void theme_apply(lv_obj_t* obj, lv_theme_style_t name) { _lv_style_list_add_style(list, &style_label_white); } break; +#endif case LV_THEME_LINEMETER: list = lv_obj_get_style_list(obj, LV_LINEMETER_PART_MAIN); diff --git a/src/libs/lv_conf.h b/src/libs/lv_conf.h index 1e27479..d3da8d6 100644 --- a/src/libs/lv_conf.h +++ b/src/libs/lv_conf.h @@ -724,7 +724,7 @@ typedef void* lv_obj_user_data_t; #endif /*Table (dependencies: lv_label)*/ -#define LV_USE_TABLE 1 +#define LV_USE_TABLE 0 #if LV_USE_TABLE #define LV_TABLE_COL_MAX 12 #define LV_TABLE_CELL_STYLE_CNT 5 |