mirrors/hekate
1
0
Fork 0
mirror of https://github.com/CTCaer/hekate.git synced 2024-12-23 16:36:03 +00:00
Code Issues Releases Activity

nyx: Update hekate theme

Browse source
This commit is contained in:
CTCaer 2020-04-30 03:57:10 +03:00
parent 279b67fa49
commit e89b7f12dd
3 changed files with 37 additions and 24 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
nyx/nyx_gui/frontend/gui.c
View file

@ -423,7 +423,7 @@ lv_obj_t *nyx_create_standard_window(const char *win_title)
static lv_style_t win_bg_style; static lv_style_t win_bg_style;
lv_style_copy(&win_bg_style, &lv_style_plain); lv_style_copy(&win_bg_style, &lv_style_plain);
win_bg_style.body.main_color = LV_COLOR_HEX(0x2D2D2D);// TODO: COLOR_HOS_BG win_bg_style.body.main_color = lv_theme_get_current()->bg->body.main_color;
win_bg_style.body.grad_color = win_bg_style.body.main_color; win_bg_style.body.grad_color = win_bg_style.body.main_color;
lv_obj_t *win = lv_win_create(lv_scr_act(), NULL); lv_obj_t *win = lv_win_create(lv_scr_act(), NULL);
@ -441,7 +441,7 @@ lv_obj_t *nyx_create_window_custom_close_btn(const char *win_title, lv_action_t
static lv_style_t win_bg_style; static lv_style_t win_bg_style;
lv_style_copy(&win_bg_style, &lv_style_plain); lv_style_copy(&win_bg_style, &lv_style_plain);
win_bg_style.body.main_color = LV_COLOR_HEX(0x2D2D2D);// TODO: COLOR_HOS_BG win_bg_style.body.main_color = lv_theme_get_current()->bg->body.main_color;
win_bg_style.body.grad_color = win_bg_style.body.main_color; win_bg_style.body.grad_color = win_bg_style.body.main_color;
lv_obj_t *win = lv_win_create(lv_scr_act(), NULL); lv_obj_t *win = lv_win_create(lv_scr_act(), NULL);
@ -972,7 +972,7 @@ lv_obj_t *create_window_launch(const char *win_title)
static lv_style_t win_bg_style; static lv_style_t win_bg_style;
lv_style_copy(&win_bg_style, &lv_style_plain); lv_style_copy(&win_bg_style, &lv_style_plain);
win_bg_style.body.main_color = LV_COLOR_HEX(0x2D2D2D);// TODO: COLOR_HOS_BG win_bg_style.body.main_color = lv_theme_get_current()->bg->body.main_color;
win_bg_style.body.grad_color = win_bg_style.body.main_color; win_bg_style.body.grad_color = win_bg_style.body.main_color;
lv_obj_t *win = lv_win_create(lv_scr_act(), NULL); lv_obj_t *win = lv_win_create(lv_scr_act(), NULL);
@ -1547,8 +1547,8 @@ static void _nyx_main_menu(lv_theme_t * th)
lv_obj_t *cnr = lv_cont_create(scr, NULL); lv_obj_t *cnr = lv_cont_create(scr, NULL);
static lv_style_t base_bg_style; static lv_style_t base_bg_style;
lv_style_copy(&base_bg_style, &lv_style_plain_color); lv_style_copy(&base_bg_style, &lv_style_plain_color);
base_bg_style.body.main_color = LV_COLOR_HEX(0x2D2D2D); base_bg_style.body.main_color = th->bg->body.main_color;
base_bg_style.body.grad_color = LV_COLOR_HEX(0x2D2D2D); base_bg_style.body.grad_color = base_bg_style.body.main_color;
lv_cont_set_style(cnr, &base_bg_style); lv_cont_set_style(cnr, &base_bg_style);
lv_obj_set_size(cnr, LV_HOR_RES, LV_VER_RES); lv_obj_set_size(cnr, LV_HOR_RES, LV_VER_RES);

47
nyx/nyx_gui/libs/lvgl/lv_themes/lv_theme_hekate.c
View file

@ -25,14 +25,18 @@
* DEFINES * DEFINES
*********************/ *********************/
#define DEF_RADIUS 4 #define DEF_RADIUS 4
#define COLOR_SHADOW_LIGHT LV_COLOR_HEX3(0xAAA) #define COLOR_SHADOW_LIGHT LV_COLOR_HEX(0xAAAAAA)
#define COLOR_SHADOW_DARK LV_COLOR_HEX(0x1F1F1F) #define COLOR_SHADOW_DARK LV_COLOR_HEX(0x1F1F1F)
#define COLOR_HOS_TURQUOISE LV_COLOR_HEX(0x00FFC9) #define COLOR_HOS_TURQUOISE (lv_color_hsv_to_rgb(_hue, 100, 100)) // 0x00FFC9
#define COLOR_HOS_TEAL_LIGHTER LV_COLOR_HEX(0x00EDBA) #define COLOR_HOS_TEAL_LIGHTER (lv_color_hsv_to_rgb(_hue, 100, 93)) // 0x00EDBA
#define COLOR_HOS_TEAL_LIGHT LV_COLOR_HEX(0x00B78F) #define COLOR_HOS_TEAL_LIGHT (lv_color_hsv_to_rgb(_hue, 100, 72)) // 0x00B78F
#define COLOR_HOS_TEAL LV_COLOR_HEX(0x00A273) #define COLOR_HOS_TEAL (lv_color_hsv_to_rgb(_hue, 100, 64)) // 0x00A273
#define COLOR_HOS_ORANGE LV_COLOR_HEX(0xFF5500)
#define COLOR_HOS_BG_DARKER LV_COLOR_HEX(0x1B1B1B)
#define COLOR_HOS_BG_DARK LV_COLOR_HEX(0x222222)
#define COLOR_HOS_BG LV_COLOR_HEX(0x2D2D2D) #define COLOR_HOS_BG LV_COLOR_HEX(0x2D2D2D)
#define COLOR_HOS_BG_LIGHT LV_COLOR_HEX(0x3D3D3D) #define COLOR_HOS_BG_LIGHT LV_COLOR_HEX(0x3D3D3D)
#define COLOR_HOS_LIGHT_BORDER LV_COLOR_HEX(0x4D4D4D)
#define COLOR_HOS_TXT_WHITE LV_COLOR_HEX(0xFBFBFB) #define COLOR_HOS_TXT_WHITE LV_COLOR_HEX(0xFBFBFB)
/********************** /**********************
@ -87,7 +91,7 @@ static void basic_init(void)
panel.body.main_color = COLOR_HOS_BG; panel.body.main_color = COLOR_HOS_BG;
panel.body.grad_color = COLOR_HOS_BG; panel.body.grad_color = COLOR_HOS_BG;
panel.body.border.width = 1; panel.body.border.width = 1;
panel.body.border.color = LV_COLOR_HEX(0x4D4D4D); panel.body.border.color = COLOR_HOS_LIGHT_BORDER;
panel.body.border.opa = LV_OPA_COVER; panel.body.border.opa = LV_OPA_COVER;
panel.body.shadow.color = COLOR_SHADOW_LIGHT; panel.body.shadow.color = COLOR_SHADOW_LIGHT;
panel.body.shadow.type = LV_SHADOW_BOTTOM; panel.body.shadow.type = LV_SHADOW_BOTTOM;
@ -158,7 +162,7 @@ static void btn_init(void)
tgl_pr.body.shadow.width = 0; tgl_pr.body.shadow.width = 0;
lv_style_copy(&ina, &rel); lv_style_copy(&ina, &rel);
ina.body.main_color = LV_COLOR_HEX(0x1B1B1B); ina.body.main_color = COLOR_HOS_BG_DARK;
ina.body.grad_color = ina.body.main_color; ina.body.grad_color = ina.body.main_color;
//ina.body.shadow.width = 0; //ina.body.shadow.width = 0;
ina.text.color = LV_COLOR_HEX(0x888888); ina.text.color = LV_COLOR_HEX(0x888888);
@ -183,7 +187,7 @@ static void label_init(void)
prim.text.color = COLOR_HOS_TXT_WHITE; prim.text.color = COLOR_HOS_TXT_WHITE;
lv_style_copy(&sec, &prim); lv_style_copy(&sec, &prim);
sec.text.color = LV_COLOR_HEX(0xFF5500); sec.text.color = COLOR_HOS_ORANGE;
lv_style_copy(&hint, &prim); lv_style_copy(&hint, &prim);
hint.text.color = LV_COLOR_HEX(0xCCCCCC); hint.text.color = LV_COLOR_HEX(0xCCCCCC);
@ -203,7 +207,7 @@ static void img_init(void)
img_light.image.intense = LV_OPA_80; img_light.image.intense = LV_OPA_80;
lv_style_copy(&img_dark, &def); lv_style_copy(&img_dark, &def);
img_dark.image.color = LV_COLOR_HEX(0x1B1B1B); img_dark.image.color = COLOR_HOS_BG_DARKER;
img_dark.image.intense = LV_OPA_80; img_dark.image.intense = LV_OPA_80;
@ -246,7 +250,7 @@ static void bar_init(void)
static lv_style_t bar_bg, bar_indic; static lv_style_t bar_bg, bar_indic;
lv_style_copy(&bar_bg, &def); lv_style_copy(&bar_bg, &def);
bar_bg.body.main_color = LV_COLOR_HEX(0x4D4D4D); bar_bg.body.main_color = COLOR_HOS_LIGHT_BORDER;
bar_bg.body.grad_color = bar_bg.body.main_color; bar_bg.body.grad_color = bar_bg.body.main_color;
bar_bg.body.radius = 3; bar_bg.body.radius = 3;
bar_bg.body.border.width = 0; bar_bg.body.border.width = 0;
@ -488,16 +492,14 @@ static void btnm_init(void)
tgl_pr.body.grad_color = tgl_pr.body.main_color; tgl_pr.body.grad_color = tgl_pr.body.main_color;
tgl_pr.body.border.width = 0; tgl_pr.body.border.width = 0;
lv_style_copy(&ina, &pr); lv_style_copy(&ina, theme.btn.ina);
ina.body.main_color = LV_COLOR_HEX3(0xCCC);
ina.body.grad_color = ina.body.main_color;
theme.btnm.bg = &bg; theme.btnm.bg = &bg;
theme.btnm.btn.rel = &rel; theme.btnm.btn.rel = &rel;
theme.btnm.btn.pr = ≺ theme.btnm.btn.pr = ≺
theme.btnm.btn.tgl_rel = &tgl_rel; theme.btnm.btn.tgl_rel = &tgl_rel;
theme.btnm.btn.tgl_pr = &tgl_pr; theme.btnm.btn.tgl_pr = &tgl_pr;
theme.btnm.btn.ina = &def; theme.btnm.btn.ina = &ina;
#endif #endif
} }
@ -509,6 +511,11 @@ static void kb_init(void)
lv_style_copy(&bg, theme.btnm.bg); lv_style_copy(&bg, theme.btnm.bg);
bg.text.color = LV_COLOR_HEX(0xCCCCCC); bg.text.color = LV_COLOR_HEX(0xCCCCCC);
bg.body.border.width = 0;
bg.body.radius = 0;
bg.body.shadow.color = COLOR_SHADOW_DARK;
bg.body.shadow.type = LV_SHADOW_BOTTOM;
bg.body.shadow.width = 4;
lv_style_copy(&rel, &lv_style_transp); lv_style_copy(&rel, &lv_style_transp);
rel.text.font = _font; rel.text.font = _font;
@ -558,7 +565,13 @@ static void page_init(void)
static void ta_init(void) static void ta_init(void)
{ {
#if USE_LV_TA #if USE_LV_TA
static lv_style_t oneline; static lv_style_t panel, oneline;
lv_style_copy(&panel, theme.panel);
panel.body.border.width = 0;
panel.body.shadow.color = COLOR_SHADOW_DARK;
panel.body.shadow.type = LV_SHADOW_FULL;
panel.body.shadow.width = 3;
lv_style_copy(&oneline, &def); lv_style_copy(&oneline, &def);
oneline.body.empty = 1; oneline.body.empty = 1;
@ -569,7 +582,7 @@ static void ta_init(void)
oneline.body.border.opa = LV_OPA_COVER; oneline.body.border.opa = LV_OPA_COVER;
oneline.text.color = LV_COLOR_HEX(0x888888); oneline.text.color = LV_COLOR_HEX(0x888888);
theme.ta.area = theme.panel; theme.ta.area = &panel;
theme.ta.oneline = &oneline; theme.ta.oneline = &oneline;
theme.ta.cursor = NULL; // Let library to calculate the cursor's style. theme.ta.cursor = NULL; // Let library to calculate the cursor's style.
theme.ta.sb = &sb; theme.ta.sb = &sb;
@ -626,7 +639,7 @@ static void list_init(void)
tgl_pr.body.border.width = 0; tgl_pr.body.border.width = 0;
lv_style_copy(&ina, &pr); lv_style_copy(&ina, &pr);
ina.body.main_color = LV_COLOR_HEX(0x1B1B1B); ina.body.main_color = COLOR_HOS_BG_DARK;
ina.body.grad_color = ina.body.main_color; ina.body.grad_color = ina.body.main_color;
theme.list.sb = &sb; theme.list.sb = &sb;

4
nyx/nyx_gui/libs/lvgl/lv_themes/lv_theme_hekate.h
View file

@ -14,8 +14,8 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>. * along with this program. If not, see <http://www.gnu.org/licenses/>.
*/ */
#ifndef LV_THEME_MATERIAL_H #ifndef LV_THEME_HEKATE_H
#define LV_THEME_MATERIAL_H #define LV_THEME_HEKATE_H
#ifdef __cplusplus #ifdef __cplusplus
extern "C" { extern "C" {