From de4891e133014cf8fb5d051729a1f75035017911 Mon Sep 17 00:00:00 2001 From: CTCaer Date: Thu, 30 Apr 2020 01:33:14 +0300 Subject: [PATCH] nyx: Correct label styles set --- nyx/nyx_gui/frontend/gui.c | 6 +++--- nyx/nyx_gui/frontend/gui_info.c | 10 +++++----- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/nyx/nyx_gui/frontend/gui.c b/nyx/nyx_gui/frontend/gui.c index b913096..62c92d2 100644 --- a/nyx/nyx_gui/frontend/gui.c +++ b/nyx/nyx_gui/frontend/gui.c @@ -730,7 +730,7 @@ static void _create_tab_about(lv_theme_t * th, lv_obj_t * parent) lv_obj_t * lbl_credits = lv_label_create(parent, NULL); lv_obj_align(lbl_credits, NULL, LV_ALIGN_IN_TOP_LEFT, LV_DPI / 2, LV_DPI / 2); - lv_ta_set_style(lbl_credits, LV_TA_STYLE_BG, &monospace_text); + lv_label_set_style(lbl_credits, &monospace_text); lv_label_set_recolor(lbl_credits, true); lv_label_set_static_text(lbl_credits, "hekate (c) 2018 naehrwert, st4rk\n\n" @@ -758,7 +758,7 @@ static void _create_tab_about(lv_theme_t * th, lv_obj_t * parent) lv_obj_t * lbl_octopus = lv_label_create(parent, NULL); lv_obj_align(lbl_octopus, lbl_credits, LV_ALIGN_OUT_RIGHT_TOP, -LV_DPI / 10, 0); - lv_ta_set_style(lbl_octopus, LV_TA_STYLE_BG, &monospace_text); + lv_label_set_style(lbl_octopus, &monospace_text); lv_label_set_recolor(lbl_octopus, true); lv_label_set_static_text(lbl_octopus, @@ -794,7 +794,7 @@ static void _create_tab_about(lv_theme_t * th, lv_obj_t * parent) s_printf(version, "Nyx v%d.%d.%d", NYX_VER_MJ, NYX_VER_MN, NYX_VER_HF); lv_obj_t * lbl_ver = lv_label_create(parent, NULL); lv_obj_align(lbl_ver, ctcaer_img, LV_ALIGN_OUT_BOTTOM_RIGHT, -LV_DPI / 20, LV_DPI / 4); - lv_ta_set_style(lbl_ver, LV_TA_STYLE_BG, &monospace_text); + lv_label_set_style(lbl_ver, &monospace_text); lv_label_set_text(lbl_ver, version); } diff --git a/nyx/nyx_gui/frontend/gui_info.c b/nyx/nyx_gui/frontend/gui_info.c index aff1837..27bfc41 100644 --- a/nyx/nyx_gui/frontend/gui_info.c +++ b/nyx/nyx_gui/frontend/gui_info.c @@ -228,7 +228,7 @@ static lv_res_t _create_window_fuses_info_status(lv_obj_t *btn) lv_obj_t * lb_desc = lv_label_create(desc, NULL); lv_label_set_long_mode(lb_desc, LV_LABEL_LONG_BREAK); lv_label_set_recolor(lb_desc, true); - lv_ta_set_style(lb_desc, LV_TA_STYLE_BG, &monospace_text); + lv_label_set_style(lb_desc, &monospace_text); lv_label_set_static_text(lb_desc, "#00DDFF Detailed Info:#\n" @@ -386,7 +386,7 @@ static lv_res_t _create_window_bootrom_info_status(lv_obj_t *btn) lv_obj_t * lb_desc = lv_label_create(desc, NULL); lv_label_set_long_mode(lb_desc, LV_LABEL_LONG_BREAK); lv_label_set_recolor(lb_desc, true); - lv_ta_set_style(lb_desc, LV_TA_STYLE_BG, &monospace_text); + lv_label_set_style(lb_desc, &monospace_text); char *txt_buf = (char *)malloc(0x1000); ipatches_txt = txt_buf; @@ -425,7 +425,7 @@ static lv_res_t _create_window_tsec_keys_status(lv_obj_t *btn) lv_obj_t * lb_desc = lv_label_create(desc, NULL); lv_label_set_long_mode(lb_desc, LV_LABEL_LONG_BREAK); lv_label_set_recolor(lb_desc, true); - lv_ta_set_style(lb_desc, LV_TA_STYLE_BG, &monospace_text); + lv_label_set_style(lb_desc, &monospace_text); // Read package1. char *build_date = malloc(32); @@ -456,7 +456,7 @@ static lv_res_t _create_window_tsec_keys_status(lv_obj_t *btn) lv_obj_set_size(val, LV_HOR_RES / 11 * 3, LV_VER_RES - (LV_DPI * 11 / 6)); lv_obj_t * lb_val = lv_label_create(val, lb_desc); - lv_ta_set_style(lb_val, LV_TA_STYLE_BG, &monospace_text); + lv_label_set_style(lb_val, &monospace_text); lv_label_set_text(lb_val, "Please wait..."); lv_obj_set_width(lb_val, lv_obj_get_width(val)); @@ -637,7 +637,7 @@ static lv_res_t _create_window_emmc_info_status(lv_obj_t *btn) lv_obj_set_size(desc2, LV_HOR_RES / 2 / 4 * 4, LV_VER_RES - (LV_DPI * 11 / 7) - 5); lv_obj_t * lb_desc2 = lv_label_create(desc2, lb_desc); - lv_ta_set_style(lb_desc2, LV_TA_STYLE_BG, &monospace_text); + lv_label_set_style(lb_desc2, &monospace_text); u32 boot_size = storage.ext_csd.boot_mult << 17; u32 rpmb_size = storage.ext_csd.rpmb_mult << 17;