From 3a9a23b3505256393bfecd9273ddb75a775202d2 Mon Sep 17 00:00:00 2001 From: Gabor Date: Wed, 10 May 2017 15:45:00 +0200 Subject: [PATCH] minor style updates --- lv_app/lv_app.c | 4 +++- lv_app/lv_app_util/lv_app_kb.c | 4 ++-- lv_obj/lv_style.c | 2 +- 3 files changed, 6 insertions(+), 4 deletions(-) diff --git a/lv_app/lv_app.c b/lv_app/lv_app.c index 05e1dfb1b..d66a6dc43 100644 --- a/lv_app/lv_app.c +++ b/lv_app/lv_app.c @@ -1011,8 +1011,10 @@ static void lv_app_init_style(void) app_style.menu_btn_rel.ccolor = COLOR_WHITE; app_style.menu_btn_rel.mcolor = COLOR_MAKE(0x30, 0x30, 0x30); app_style.menu_btn_rel.gcolor = COLOR_MAKE(0x30, 0x30, 0x30); - app_style.menu_btn_rel.bcolor = COLOR_MAKE(0x80, 0x80, 0x80); + app_style.menu_btn_rel.bcolor = COLOR_MAKE(0xa0, 0xa0, 0xa0); + app_style.menu_btn_rel.bopa = OPA_20; app_style.menu_btn_rel.bwidth = 0; + app_style.menu_btn_rel.radius = 0; app_style.menu_btn_rel.swidth = 0; app_style.menu_btn_rel.empty = 1; diff --git a/lv_app/lv_app_util/lv_app_kb.c b/lv_app/lv_app_util/lv_app_kb.c index 256897778..0eb843b8f 100644 --- a/lv_app/lv_app_util/lv_app_kb.c +++ b/lv_app/lv_app_util/lv_app_kb.c @@ -33,14 +33,14 @@ static lv_obj_t * kb_win; static lv_obj_t * kb_ta; static const char * kb_map_lc[] = { "\0051#", "\004q", "\004w", "\004e", "\004r", "\004t", "\004y", "\004u", "\004i", "\004o", "\004p", "\007Del", "\n", -"\007ABC", "\004a", "\004s", "\004d", "\004f", "\004g", "\004h", "\004j", "\004k", "\004l", "\010Enter", "\n", +"\006ABC", "\003a", "\003s", "\003d", "\003f", "\003g", "\003h", "\003j", "\003k", "\003l", "\010Enter", "\n", "_", "-", "z", "x", "c", "v", "b", "n", "m", ".", ",", ":", "\n", "\003Hide", "\003Left", "\006 ", "\003Right", "\003Ok", "" }; static const char * kb_map_uc[] = { "\0051#", "\004Q", "\004W", "\004E", "\004R", "\004T", "\004Y", "\004U", "\004I", "\004O", "\004P", "\007Del", "\n", -"\007abc", "\004A", "\004S", "\004D", "\004F", "\004G", "\004H", "\004J", "\004K", "\004L", "\010Enter", "\n", +"\006abc", "\003A", "\003S", "\003D", "\003F", "\003G", "\003H", "\003J", "\003K", "\003L", "\010Enter", "\n", "_", "-", "Z", "X", "C", "V", "B", "N", "M", ".", ",", ":", "\n", "\003Hide", "\003Left", "\006 ", "\003Right", "\003Ok", "" }; diff --git a/lv_obj/lv_style.c b/lv_obj/lv_style.c index 7f0366fc1..e0ab30cbf 100644 --- a/lv_obj/lv_style.c +++ b/lv_obj/lv_style.c @@ -76,7 +76,7 @@ void lv_style_init (void) lv_style_scr.font = font_get(FONT_DEFAULT); lv_style_scr.letter_space = 1 * LV_DOWNSCALE; lv_style_scr.line_space = 3 * LV_DOWNSCALE; - lv_style_scr.txt_align = 0; + lv_style_scr.txt_align = LV_TXT_ALIGN_LEFT; lv_style_scr.img_recolor = OPA_TRANSP; lv_style_scr.line_width = 1 * LV_DOWNSCALE;