From 3519e318888678e24649820d1aa7063e772e66e4 Mon Sep 17 00:00:00 2001 From: Gabor Kiss-Vamosi Date: Fri, 3 Apr 2020 15:38:20 +0200 Subject: [PATCH] improve material theme --- src/lv_themes/lv_theme.h | 1 + src/lv_themes/lv_theme_material.c | 9 ++++++--- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/src/lv_themes/lv_theme.h b/src/lv_themes/lv_theme.h index 40341d19c..b9193ac42 100644 --- a/src/lv_themes/lv_theme.h +++ b/src/lv_themes/lv_theme.h @@ -187,6 +187,7 @@ lv_style_t * lv_theme_get_style_part(lv_theme_style_t name, uint8_t part); #include "lv_theme_empty.h" #include "lv_theme_template.h" #include "lv_theme_material.h" +#include "lv_theme_mono.h" #ifdef __cplusplus } /* extern "C" */ diff --git a/src/lv_themes/lv_theme_material.c b/src/lv_themes/lv_theme_material.c index 2fe6d1c5d..30e862fd1 100644 --- a/src/lv_themes/lv_theme_material.c +++ b/src/lv_themes/lv_theme_material.c @@ -598,7 +598,11 @@ static void keyboard_init(void) lv_style_set_radius(&kb_bg, LV_STATE_DEFAULT, 0); lv_style_set_border_width(&kb_bg, LV_STATE_DEFAULT, (LV_DPI / 40 > 0 ? LV_DPI / 40 : 1)); lv_style_set_border_side(&kb_bg, LV_STATE_DEFAULT, LV_BORDER_SIDE_TOP); - + lv_style_set_pad_left(&kb_bg, LV_STATE_DEFAULT, LV_DPI / 20); + lv_style_set_pad_right(&kb_bg, LV_STATE_DEFAULT, LV_DPI / 20); + lv_style_set_pad_top(&kb_bg, LV_STATE_DEFAULT, LV_DPI / 20); + lv_style_set_pad_bottom(&kb_bg, LV_STATE_DEFAULT, LV_DPI / 20); + lv_style_set_pad_inner(&kb_bg, LV_STATE_DEFAULT, LV_DPI / 40); #endif } @@ -915,8 +919,6 @@ void lv_theme_material_apply(lv_obj_t * obj, lv_theme_style_t name) list = lv_obj_get_style_list(obj, LV_KEYBOARD_PART_BG); lv_style_list_add_style(list, &scr); lv_style_list_add_style(list, &kb_bg); - lv_style_list_add_style(list, &pad_small); - lv_obj_clean_style_list(obj, LV_KEYBOARD_PART_BTN); list = lv_obj_get_style_list(obj, LV_KEYBOARD_PART_BTN); @@ -946,6 +948,7 @@ void lv_theme_material_apply(lv_obj_t * obj, lv_theme_style_t name) lv_obj_clean_style_list(obj, LV_SWITCH_PART_INDIC); list = lv_obj_get_style_list(obj, LV_SWITCH_PART_INDIC); lv_style_list_add_style(list, &bar_indic); + lv_style_list_add_style(list, &bg); lv_obj_clean_style_list(obj, LV_SWITCH_PART_KNOB); list = lv_obj_get_style_list(obj, LV_SWITCH_PART_KNOB);