diff --git a/lv_app/lv_app.c b/lv_app/lv_app.c index 9f55da900..0c58e9498 100644 --- a/lv_app/lv_app.c +++ b/lv_app/lv_app.c @@ -533,8 +533,6 @@ static void lv_app_init_desktop(void) lv_cont_set_layout(lv_page_get_scrl(sc_page), LV_CONT_LAYOUT_GRID); lv_page_set_rel_action(sc_page, lv_app_sc_page_rel_action); lv_page_set_sb_mode(sc_page, LV_PAGE_SB_MODE_AUTO); - - } #endif @@ -562,7 +560,7 @@ static lv_action_res_t lv_app_menu_rel_action(lv_obj_t * app_btn, lv_dispi_t * d app_list = lv_list_create(lv_scr_act(), NULL); lv_obj_t * scrl = lv_page_get_scrl(app_list); lv_obj_set_style(scrl, &app_style.menu); - lv_obj_set_size(app_list, LV_HOR_RES / 3, (LV_VER_RES * 3) / 4); + lv_obj_set_size(app_list, LV_HOR_RES / 2, (LV_VER_RES * 3) / 4); lv_obj_align(app_list, menuh, LV_ALIGN_OUT_BOTTOM_LEFT, 0, 0); lv_list_set_styles_btn(app_list, &app_style.menu_btn_rel, &app_style.menu_btn_pr, NULL, NULL, NULL); diff --git a/lv_appx/lv_app_sysmon.c b/lv_appx/lv_app_sysmon.c index ef747f4f5..c898ddee5 100644 --- a/lv_appx/lv_app_sysmon.c +++ b/lv_appx/lv_app_sysmon.c @@ -363,8 +363,8 @@ static void lv_app_sysmon_refr(void) MEM_LABEL_COLOR, mem_pct[LV_APP_SYSMON_PNUM - 1], TXT_RECOLOR_CMD, - mem_mon.size_total, - mem_mon.size_total - mem_mon.size_free, mem_mon.size_free, mem_mon.pct_frag); + (int)mem_mon.size_total, + (int)mem_mon.size_total - mem_mon.size_free, mem_mon.size_free, mem_mon.pct_frag); sprintf(buf_short, "%sMem: %d %%\nFrag: %d %%\n", buf_short, mem_pct[LV_APP_SYSMON_PNUM - 1], mem_mon.pct_frag); @@ -380,7 +380,6 @@ static void lv_app_sysmon_refr(void) if(win_data != NULL) { lv_label_set_text(win_data->label, buf_long); - lv_chart_set_next(win_data->chart, win_data->mem_dl, mem_pct[LV_APP_SYSMON_PNUM - 1]); lv_chart_set_next(win_data->chart, win_data->cpu_dl, cpu_pct[LV_APP_SYSMON_PNUM - 1]); diff --git a/lv_conf_temp.h b/lv_conf_temp.h index e22644ad7..993c37976 100644 --- a/lv_conf_temp.h +++ b/lv_conf_temp.h @@ -42,7 +42,7 @@ *=================*/ /*Display Input settings*/ #define LV_DISPI_READ_PERIOD 50 /*Input device read period milliseconds*/ -#define LV_DISPI_TP_MARKER 0 /*Mark the pressed points*/ +#define LV_DISPI_TP_MARKER 0 /*Mark the pressed points (Value means marker point size)*/ #define LV_DISPI_DRAG_LIMIT 10 /*Drag threshold in pixels */ #define LV_DISPI_DRAG_THROW 20 /*Drag throw slow-down in [%]. Greater value means faster slow-down */ #define LV_DISPI_LONG_PRESS_TIME 400 /*Long press time in milliseconds*/ @@ -161,6 +161,9 @@ #define LV_APP_ENABLE 1 #if LV_APP_ENABLE != 0 + +#define LV_APP_DESKTOP 1 + #define LV_APP_SC_WIDTH (LV_HOR_RES / 4) /*Shortcut width*/ #define LV_APP_SC_HEIGHT (LV_VER_RES / 3) /*Shortcut height*/ #define LV_APP_FONT_SMALL FONT_DEJAVU_20 diff --git a/lv_draw/lv_draw_rbasic.c b/lv_draw/lv_draw_rbasic.c index 198701d4e..d1c3ed294 100644 --- a/lv_draw/lv_draw_rbasic.c +++ b/lv_draw/lv_draw_rbasic.c @@ -148,7 +148,7 @@ void lv_rletter(const point_t * pos_p, const area_t * mask_p, if(px_cnt != 0) { - lv_rpx(pos_p->x + col, pos_p->y + row, mask_p, color_mix(color, COLOR_SILVER, 63 * px_cnt)); + lv_rpx(pos_p->x + col, pos_p->y + row, mask_p, color_mix(color, COLOR_SILVER, 63 * px_cnt), OPA_COVER); } } diff --git a/lv_objx/lv_page.c b/lv_objx/lv_page.c index 69fbf1490..41cc6a442 100644 --- a/lv_objx/lv_page.c +++ b/lv_objx/lv_page.c @@ -460,7 +460,7 @@ void lv_page_focus(lv_obj_t * page, lv_obj_t * obj, uint16_t anim_time) a.act_time = 0; a.start = lv_obj_get_y(ext->scrl); a.end = scrlable_y; - a.time = LV_PAGE_ANIM_FOCUS_TIME;//anim_speed_to_time(LV_PAGE_ANIM_SPEED, a.start, a.end); + a.time = anim_time; a.end_cb = NULL; a.playback = 0; a.repeat = 0;