github-code/lvgl
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

refactor(color) small fixes (#2211)

Browse Source
This commit is contained in:
Amir Gonnen
2021-04-24 17:34:09 +03:00
committed by GitHub
parent 070df61eb2
commit 3dfc59435d
2 changed files with 4 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/extra/themes/basic/lv_theme_basic.c
View File

@@ -18,10 +18,10 @@
*********************/ *********************/
#define COLOR_WHITE lv_color_white() #define COLOR_WHITE lv_color_white()
#define COLOR_LIGHT lv_color_grey_lighten_3() #define COLOR_LIGHT lv_palette_lighten(LV_PALETTE_GREY, 3)
#define COLOR_MID lv_color_grey_lighten_1() #define COLOR_MID lv_palette_lighten(LV_PALETTE_GREY, 1)
#define COLOR_DARK lv_palette_main(LV_PALETTE_GREY) #define COLOR_DARK lv_palette_main(LV_PALETTE_GREY)
#define COLOR_DIM lv_color_grey_darken_2() #define COLOR_DIM lv_palette_darken(LV_PALETTE_GREY, 2)
#define PAD_DEF LV_DPX(5) #define PAD_DEF LV_DPX(5)
/********************** /**********************
@@ -79,7 +79,7 @@ static void style_init(void)
{ {
style_init_reset(&styles->scrollbar); style_init_reset(&styles->scrollbar);
lv_style_set_bg_opa(&styles->scrollbar, LV_OPA_COVER); lv_style_set_bg_opa(&styles->scrollbar, LV_OPA_COVER);
lv_style_set_bg_color(&styles->scrollbar, lv_color_grey_darken_2()); lv_style_set_bg_color(&styles->scrollbar, lv_palette_darken(LV_PALETTE_GREY, 2));
lv_style_set_width(&styles->scrollbar, PAD_DEF); lv_style_set_width(&styles->scrollbar, PAD_DEF);
style_init_reset(&styles->scr); style_init_reset(&styles->scr);

20
src/misc/lv_color.h
View File

@@ -656,26 +656,6 @@ lv_color_hsv_t lv_color_rgb_to_hsv(uint8_t r8, uint8_t g8, uint8_t b8);
*/ */
lv_color_hsv_t lv_color_to_hsv(lv_color_t color); lv_color_hsv_t lv_color_to_hsv(lv_color_t color);
lv_color_t lv_color_get_palette_main(lv_palette_t palette);
lv_color_t lv_color_get_palette_lighten_1(lv_palette_t palette);
lv_color_t lv_color_get_palette_lighten_2(lv_palette_t palette);
lv_color_t lv_color_get_palette_lighten_3(lv_palette_t palette);
lv_color_t lv_color_get_palette_lighten_4(lv_palette_t palette);
lv_color_t lv_color_get_palette_lighten_5(lv_palette_t palette);
lv_color_t lv_color_get_palette_darken_1(lv_palette_t palette);
lv_color_t lv_color_get_palette_darken_2(lv_palette_t palette);
lv_color_t lv_color_get_palette_darken_3(lv_palette_t palette);
lv_color_t lv_color_get_palette_darken_4(lv_palette_t palette);
/********************** /**********************
* PREDEFINED COLORS * PREDEFINED COLORS
**********************/ **********************/