Merge branch 'dev-5.3' of https://github.com/turoksama/lvgl into turoksama-dev-5.3

lv_conf_templ.h

@@ -296,7 +296,6 @@
 #define USE_LV_DDLIST    1
 #if USE_LV_DDLIST != 0
 #define LV_DDLIST_ANIM_TIME     200     /*Open and close default animation time [ms] (0: no animation)*/
-#define LV_DDLIST_USE_STYLE_INDC  1     /*Use a down arrow in ddlist */
 #endif
 
 /*Roller (dependencies: lv_ddlist)*/

lv_objx/lv_ddlist.c

@@ -92,9 +92,8 @@ lv_obj_t * lv_ddlist_create(lv_obj_t * par, const lv_obj_t * copy)
     ext->option_cnt = 0;
     ext->anim_time = LV_DDLIST_ANIM_TIME;
     ext->sel_style = &lv_style_plain_color;
-#if LV_DDLIST_USE_STYLE_INDC != 0
-    ext->roller_ddlist = 1;
-#endif
+    ext->draw_arrow = 0;  /*Do not draw arrow by default*/
+
     /*The signal and design functions are not copied so set them here*/
     lv_obj_set_signal_func(new_ddlist, lv_ddlist_signal);
     lv_obj_set_signal_func(lv_page_get_scrl(new_ddlist), lv_ddlist_scrl_signal);
@@ -153,6 +152,19 @@ lv_obj_t * lv_ddlist_create(lv_obj_t * par, const lv_obj_t * copy)
  * Setter functions
  *====================*/
 
+/**
+ * Set arrow draw in a drop down list
+ * @param ddlist pointer to drop down list object
+ * @param en enable/disable a arrow draw. E.g. "true" for draw.
+ */
+void lv_ddlist_set_draw_arrow(lv_obj_t * ddlist, bool en)
+{
+    lv_ddlist_ext_t * ext = lv_obj_get_ext_attr(ddlist);
+
+    /*Set the flag*/
+    ext->draw_arrow = en;
+}
+
 /**
  * Set the options in a drop down list from a string
  * @param ddlist pointer to drop down list object
@@ -278,6 +290,17 @@ void lv_ddlist_set_style(lv_obj_t * ddlist, lv_ddlist_style_t type, lv_style_t *
  * Getter functions
  *====================*/
 
+/**
+ * Get arrow draw in a drop down list
+ * @param ddlist pointer to drop down list object
+ */
+bool lv_ddlist_get_draw_arrow(lv_obj_t * ddlist)
+{
+    lv_ddlist_ext_t * ext = lv_obj_get_ext_attr(ddlist);
+
+    return ext->draw_arrow;
+}
+
 /**
  * Get the options of a drop down list
  * @param ddlist pointer to drop down list object
@@ -498,11 +521,12 @@ static bool lv_ddlist_design(lv_obj_t * ddlist, const lv_area_t * mask, lv_desig
                               lv_label_get_text(ext->label), LV_TXT_FLAG_NONE, NULL);
             }
         }
-#if LV_DDLIST_USE_STYLE_INDC != 0
-		//Add a down symbol in ddlist
+
+		/*Add a down symbol in ddlist*/
 		else
 		{
-			if(ext->roller_ddlist)
+			/*Draw a arrow in ddlist if enabled*/
+			if(ext->draw_arrow)
 			{
 				lv_style_t * style = lv_ddlist_get_style(ddlist, LV_DDLIST_STYLE_BG);
 				const lv_font_t * font = style->text.font;
@@ -523,18 +547,17 @@ static bool lv_ddlist_design(lv_obj_t * ddlist, const lv_area_t * mask, lv_desig
 				lv_coord_t w = lv_obj_get_width(ddlist);
 				area_sel.x1 = ddlist->coords.x2 - 20;
 				area_sel.x2 = ddlist->coords.x2 + w;
-				area_sel.y1 += 2;
+				area_sel.y1 += (font_h/2-5);	/* Height of the symbol is about 10ppx */
 				lv_area_t mask_sel;
 				bool area_ok;
 				area_ok = lv_area_intersect(&mask_sel, mask, &area_sel);
 				if (area_ok)
 				{
 					lv_draw_label(&area_sel, &mask_sel, &new_style, opa_scale,
-					SYMBOL_DOWN, LV_TXT_FLAG_NONE, NULL);
+					SYMBOL_DOWN, LV_TXT_FLAG_NONE, NULL);		/*Use a down arrow in ddlist, you can replace it with your custom symbol*/
 				}
 			}
 		}
-#endif
         /*Draw the scrollbar in the ancestor page design function*/
         ancestor_design(ddlist, mask, mode);
     }

lv_objx/lv_ddlist.h

@@ -54,9 +54,8 @@ typedef struct
     uint16_t sel_opt_id_ori;             /*Store the original index on focus*/
     uint16_t anim_time;                  /*Open/Close animation time [ms]*/
     uint8_t opened :1;                   /*1: The list is opened (handled by the library)*/
-#if LV_DDLIST_USE_STYLE_INDC != 0
-    uint8_t roller_ddlist :1;            /*0: The list is roller, otherwise ddlist*/
-#endif
+    uint8_t draw_arrow :1;               /*1: Draw arrow*/
+
     lv_coord_t fix_height;               /*Height of the ddlist when opened. (0: auto-size)*/
 } lv_ddlist_ext_t;
 
@@ -82,6 +81,13 @@ lv_obj_t * lv_ddlist_create(lv_obj_t * par, const lv_obj_t * copy);
  * Setter functions
  *====================*/
 
+/**
+ * Set arrow draw in a drop down list
+ * @param ddlist pointer to drop down list object
+ * @param en enable/disable a arrow draw. E.g. "true" for draw.
+ */
+void lv_ddlist_set_draw_arrow(lv_obj_t * ddlist, bool en);
+
 /**
  * Set the options in a drop down list from a string
  * @param ddlist pointer to drop down list object
@@ -148,6 +154,12 @@ void lv_ddlist_set_style(lv_obj_t *ddlist, lv_ddlist_style_t type, lv_style_t *s
  * Getter functions
  *====================*/
 
+/**
+ * Get arrow draw in a drop down list
+ * @param ddlist pointer to drop down list object
+ */
+bool lv_ddlist_get_draw_arrow(lv_obj_t * ddlist);
+
 /**
  * Get the options of a drop down list
  * @param ddlist pointer to drop down list object

lv_objx/lv_roller.c

@@ -74,9 +74,8 @@ lv_obj_t * lv_roller_create(lv_obj_t * par, const lv_obj_t * copy)
     lv_roller_ext_t * ext = lv_obj_allocate_ext_attr(new_roller, sizeof(lv_roller_ext_t));
     lv_mem_assert(ext);
     if(ext == NULL) return NULL;
-#if LV_DDLIST_USE_STYLE_INDC != 0
-    ext->ddlist.roller_ddlist = 0;
-#endif
+    ext->ddlist.draw_arrow = 0;  /*Do not draw arrow by default*/
+    
     /*The signal and design functions are not copied so set them here*/
     lv_obj_set_signal_func(new_roller, lv_roller_signal);
     lv_obj_set_design_func(new_roller, lv_roller_design);