diff --git a/r.patch b/r.patch new file mode 100644 index 0000000000..e3f80d5391 --- /dev/null +++ b/r.patch @@ -0,0 +1,62 @@ +diff --git a/scripts/release.py b/scripts/release.py +index c06bf529..3a7f27b8 100755 +--- a/scripts/release.py ++++ b/scripts/release.py +@@ -59,6 +59,9 @@ proj_list = [ "lv_sim_eclipse_sdl"] + ver_major = -1 + ver_minor = -1 + ver_patch = -1 ++dev_ver_major = -1 ++dev_ver_minor = -1 ++dev_ver_patch = -1 + + ver_str = "" + dev_ver_str = "" +@@ -309,7 +312,7 @@ def publish_master(): + #Merge LVGL master to dev first to avoid "merge-to-dev.yml" running asynchronous + os.chdir("./lvgl") + cmd("git checkout dev") +- cmd("git merge master -X theirs") ++ cmd("git merge master -X ours") # Use ours to keep the version numbers + cmd("git add .") + cmd("git commit -am 'Merge master'", False) + cmd("git push origin dev") +@@ -473,6 +476,11 @@ if __name__ == '__main__': + exit(1) + + clone_repos() ++ get_lvgl_version("dev") ++ dev_ver_major = ver_major ++ dev_ver_minor = ver_minor ++ dev_ver_patch = ver_patch ++ + get_lvgl_version("master") + lvgl_prepare() + lv_examples_prepare() +@@ -483,16 +491,17 @@ if __name__ == '__main__': + update_release_branches() + publish_master() + ++ projs_update() ++ + if dev_prepare == 'bugfix': + ver_patch = str(int(ver_patch) + 1) +- ver_str = "v" + ver_major + "." + ver_minor + "." + ver_patch + "-dev" ++ ver_str = "v" + str(ver_major) + "." + str(ver_minor) + "." + str(ver_patch) + "-dev" + + print("Prepare bugfix version " + ver_str) + + lvgl_update_master_version() + docs_update_latest_version() + +- get_lvgl_version("dev") + dev_ver_str = "v" + ver_major + "." + ver_minor + "." + ver_patch + "-dev" + merge_to_dev() + +@@ -520,6 +529,5 @@ if __name__ == '__main__': + docs_update_dev_version() + publish_dev_and_master() + +- projs_update() + cleanup() + diff --git a/src/lv_widgets/lv_arc.c b/src/lv_widgets/lv_arc.c index c42402e7d1..92fe9ec6c8 100644 --- a/src/lv_widgets/lv_arc.c +++ b/src/lv_widgets/lv_arc.c @@ -1081,6 +1081,7 @@ static void value_update(lv_obj_t * arc) default: /** LV_ARC_TYPE_NORMAL*/ angle = _lv_map(ext->cur_value, ext->min_value, ext->max_value, ext->bg_angle_start, bg_end); lv_arc_set_end_angle(arc, angle); + lv_arc_set_start_angle(arc, ext->bg_angle_start); } ext->last_angle = angle; /*Cache angle for slew rate limiting*/ } diff --git a/src/lv_widgets/lv_textarea.c b/src/lv_widgets/lv_textarea.c index 545cfaf2c3..f922e22648 100644 --- a/src/lv_widgets/lv_textarea.c +++ b/src/lv_widgets/lv_textarea.c @@ -1468,6 +1468,8 @@ static lv_res_t lv_textarea_signal(lv_obj_t * ta, lv_signal_t sign, void * param lv_textarea_set_cursor_pos(ta, 0); else if(c == LV_KEY_END) lv_textarea_set_cursor_pos(ta, LV_TEXTAREA_CURSOR_LAST); + else if(c == LV_KEY_ENTER && lv_textarea_get_one_line(ta)) + lv_event_send(ta, LV_EVENT_APPLY, NULL); else { lv_textarea_add_char(ta, c); }