From c1e98d3f371af9fd732fead2343e322cce051971 Mon Sep 17 00:00:00 2001 From: embeddedt <42941056+embeddedt@users.noreply.github.com> Date: Wed, 27 Mar 2019 10:39:42 -0400 Subject: [PATCH 1/3] Update all-other-issues.md --- .github/ISSUE_TEMPLATE/all-other-issues.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/ISSUE_TEMPLATE/all-other-issues.md b/.github/ISSUE_TEMPLATE/all-other-issues.md index b3f7a35e0..67d5adcd8 100644 --- a/.github/ISSUE_TEMPLATE/all-other-issues.md +++ b/.github/ISSUE_TEMPLATE/all-other-issues.md @@ -2,7 +2,7 @@ name: All other issues about: Questions and enhancement requests should go to the forum. title: '' -labels: stale +labels: not-template assignees: '' --- From 6468d925ede097b917aa3bb8d1faa2ce943950de Mon Sep 17 00:00:00 2001 From: Josh Date: Wed, 27 Mar 2019 09:23:43 -0700 Subject: [PATCH 2/3] lv_ddlist: fix original selected option not restoring on escape --- lv_objx/lv_ddlist.c | 1 + 1 file changed, 1 insertion(+) diff --git a/lv_objx/lv_ddlist.c b/lv_objx/lv_ddlist.c index d228f1642..bd5e576c6 100644 --- a/lv_objx/lv_ddlist.c +++ b/lv_objx/lv_ddlist.c @@ -701,6 +701,7 @@ static lv_res_t lv_ddlist_signal(lv_obj_t * ddlist, lv_signal_t sign, void * par } else if(c == LV_GROUP_KEY_ESC) { if(ext->opened) { ext->opened = 0; + ext->sel_opt_id = ext->sel_opt_id_ori; lv_ddlist_refr_size(ddlist, true); } } From bb20b8ca1af500b7d3426ae673ebf449befd29ce Mon Sep 17 00:00:00 2001 From: Gabor Kiss-Vamosi Date: Tue, 2 Apr 2019 05:59:23 +0200 Subject: [PATCH 3/3] rounder_cb bug fix --- lv_core/lv_refr.c | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/lv_core/lv_refr.c b/lv_core/lv_refr.c index d6987832a..1087304dd 100644 --- a/lv_core/lv_refr.c +++ b/lv_core/lv_refr.c @@ -359,14 +359,18 @@ static void lv_refr_area_with_vdb(const lv_area_t * area_p) tmp.x1 = 0; tmp.x2 = 0; tmp.y1 = 0; - tmp.y2 = max_row; - lv_coord_t y_tmp = max_row; + lv_coord_t y_tmp = max_row - 1; do { tmp.y2 = y_tmp; round_cb(&tmp); - y_tmp --; /*Decrement the number of line until it is rounded to a smaller (or equal) value then the original. */ - } while(lv_area_get_height(&tmp) > max_row && y_tmp != 0); + + /*If this height fits into `max_row` then fine*/ + if(lv_area_get_height(&tmp) <= max_row) break; + + /*Decrement the height of the area until it fits into `max_row` after rounding*/ + y_tmp --; + } while(y_tmp != 0); if(y_tmp == 0) { LV_LOG_WARN("Can't set VDB height using the round function. (Wrong round_cb or to small VDB)");