Mirrors_UI_SDK/lvgl
1
0
Fork 0
mirror of https://github.com/lvgl/lvgl.git synced 2026-05-28 22:30:49 +08:00
Code Issues Actions 59 Packages Projects Releases Wiki Activity

fix(arc): handle clicks on a full circle (#8106)

Browse Source
This commit is contained in:
Gabor Kiss-Vamosi
2025-04-24 11:28:38 +02:00
committed by GitHub
parent ffbda07212
commit 2fa653527a
1 changed files with 8 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/widgets/arc/lv_arc.c
+8 -2
View File
@@ -509,12 +509,14 @@ static void lv_arc_event(const lv_obj_class_t * class_p, lv_event_t * e)
angle -= arc->rotation; angle -= arc->rotation;
angle -= arc->bg_angle_start; /*Make the angle relative to the start angle*/ angle -= arc->bg_angle_start; /*Make the angle relative to the start angle*/
/* ensure the angle is in the range [0, 360) */ /* ensure the angle is in the range [0, 360) */
while(angle < 0) angle += 360; while(angle < 0) angle += 360;
while(angle >= 360) angle -= 360; while(angle >= 360) angle -= 360;
const uint32_t circumference = (uint32_t)((2U * r * 314U) / 100U); /* Equivalent to: 2r * 3.14, avoiding floats */ const uint32_t circumference = (uint32_t)((2U * r * 314U) / 100U); /* Equivalent to: 2r * 3.14, avoiding floats */
const lv_value_precise_t tolerance_deg = (360 * lv_dpx(50U)) / circumference; const lv_value_precise_t tolerance_deg = (360 * lv_dpx(20U)) / circumference;
const uint32_t min_close_prev = (uint32_t) arc->min_close; const uint32_t min_close_prev = (uint32_t) arc->min_close;
const bool is_angle_within_bg_bounds = lv_arc_angle_within_bg_bounds(obj, angle, tolerance_deg); const bool is_angle_within_bg_bounds = lv_arc_angle_within_bg_bounds(obj, angle, tolerance_deg);
@@ -669,7 +671,7 @@ static void lv_arc_event(const lv_obj_class_t * class_p, lv_event_t * e)
while(angle >= 360) angle -= 360; while(angle >= 360) angle -= 360;
const uint32_t circumference = (uint32_t)((2U * r * 314U) / 100U); /* Equivalent to: 2r * 3.14, avoiding floats */ const uint32_t circumference = (uint32_t)((2U * r * 314U) / 100U); /* Equivalent to: 2r * 3.14, avoiding floats */
const lv_value_precise_t tolerance_deg = (360 * lv_dpx(50U)) / circumference; const lv_value_precise_t tolerance_deg = (360 * lv_dpx(20U)) / circumference;
/* Check if the angle is outside the drawn background arc */ /* Check if the angle is outside the drawn background arc */
const bool is_angle_within_bg_bounds = lv_arc_angle_within_bg_bounds(obj, angle, tolerance_deg); const bool is_angle_within_bg_bounds = lv_arc_angle_within_bg_bounds(obj, angle, tolerance_deg);
@@ -967,11 +969,15 @@ static bool lv_arc_angle_within_bg_bounds(lv_obj_t * obj, const lv_value_precise
lv_arc_t * arc = (lv_arc_t *)obj; lv_arc_t * arc = (lv_arc_t *)obj;
lv_value_precise_t bounds_angle = arc->bg_angle_end - arc->bg_angle_start; lv_value_precise_t bounds_angle = arc->bg_angle_end - arc->bg_angle_start;
if(arc->bg_angle_end == arc->bg_angle_start) return false; /*The arc has 0 deg span*/
/* ensure the angle is in the range [0, 360) */ /* ensure the angle is in the range [0, 360) */
while(bounds_angle < 0) bounds_angle += 360; while(bounds_angle < 0) bounds_angle += 360;
while(bounds_angle >= 360) bounds_angle -= 360; while(bounds_angle >= 360) bounds_angle -= 360;
/*Full circle*/
if(bounds_angle == 0) bounds_angle = 360;
/* Angle is in the bounds */ /* Angle is in the bounds */
if(angle <= bounds_angle) { if(angle <= bounds_angle) {
if(angle < (bounds_angle / 2)) { if(angle < (bounds_angle / 2)) {