feat(scale): Check draw order when drawing

C47D · May 6, 2024 · c4bfdfe · c4bfdfe
1 parent c6b71ee
commit c4bfdfe
Showing 1 changed file with 14 additions and 4 deletions.
diff --git a/src/widgets/scale/lv_scale.c b/src/widgets/scale/lv_scale.c
@@ -487,17 +487,27 @@ static void lv_scale_event(const lv_obj_class_t * class_p, lv_event_t * event)
             scale_find_section_tick_idx(obj);
             scale_calculate_main_compensation(obj);
 
-            scale_draw_indicator(obj, event);
-            scale_draw_main(obj, event);
+            if (scale->draw_ticks_on_top) {
+				scale_draw_main(obj, event);
+            	scale_draw_indicator(obj, event);
+            } else {
+            	scale_draw_indicator(obj, event);
+            	scale_draw_main(obj, event);
+            }
         }
     }
     if(event_code == LV_EVENT_DRAW_POST) {
         if(scale->post_draw == true) {
             scale_find_section_tick_idx(obj);
             scale_calculate_main_compensation(obj);
 
-            scale_draw_indicator(obj, event);
-            scale_draw_main(obj, event);
+            if (scale->draw_ticks_on_top) {
+				scale_draw_main(obj, event);
+            	scale_draw_indicator(obj, event);
+            } else {
+            	scale_draw_indicator(obj, event);
+            	scale_draw_main(obj, event);
+            }
         }
     }
     else if(event_code == LV_EVENT_REFR_EXT_DRAW_SIZE) {