fix conflicts

2020-08-18 08:50:31 +02:00
parent e1a84f2cfe 056da0f922
commit 209e1c4d38
2 changed files with 2 additions and 3 deletions
--- a/src/lv_widgets/lv_cpicker.c
+++ b/src/lv_widgets/lv_cpicker.c
@@ -244,9 +244,7 @@ bool lv_cpicker_set_hsv(lv_obj_t * cpicker, lv_color_hsv_t hsv)

    refr_knob_pos(cpicker);

-    if(ext->type == LV_CPICKER_TYPE_DISC) {
-        lv_obj_invalidate(cpicker);
-    }
+    lv_obj_invalidate(cpicker);

    return true;
 }