Merge pull request #569 from littlevgl/imgbtn_update

lv_imgbtn: add tiling (repeated center) feature

lv_conf_templ.h

@@ -279,6 +279,9 @@
 
 /*Image Button (dependencies: lv_btn*/
 #define USE_LV_IMGBTN   1
+#if USE_LV_IMGBTN
+#define LV_IMGBTN_TILED 1           /*1: The imgbtn requires left, mid and right parts and the width can be set freely*/
+#endif
 
 /*Button matrix (dependencies: -)*/
 #define USE_LV_BTNM     1

lv_objx/lv_imgbtn.c

@@ -61,11 +61,14 @@ lv_obj_t * lv_imgbtn_create(lv_obj_t * par, const lv_obj_t * copy)
     if(ancestor_design == NULL) ancestor_design = lv_obj_get_design_func(new_imgbtn);
 
     /*Initialize the allocated 'ext' */
-    ext->img_src[LV_BTN_STATE_REL] = NULL;
+#if LV_IMGBTN_TILED == 0
-    ext->img_src[LV_BTN_STATE_PR] = NULL;
+    memset(ext->img_src, 0, sizeof(ext->img_src));
-    ext->img_src[LV_BTN_STATE_TGL_REL] = NULL;
+#else
-    ext->img_src[LV_BTN_STATE_TGL_PR] = NULL;;
+    memset(ext->img_src_left, 0, sizeof(ext->img_src_left));
-    ext->img_src[LV_BTN_STATE_INA] = NULL;
+    memset(ext->img_src_mid, 0, sizeof(ext->img_src_mid));
+    memset(ext->img_src_right, 0, sizeof(ext->img_src_right));
+#endif
+
     ext->act_cf = LV_IMG_CF_UNKOWN;
 
     /*The signal and design functions are not copied so set them here*/
@@ -79,12 +82,13 @@ lv_obj_t * lv_imgbtn_create(lv_obj_t * par, const lv_obj_t * copy)
     /*Copy an existing image button*/
     else {
         lv_imgbtn_ext_t * copy_ext = lv_obj_get_ext_attr(copy);
-
+#if LV_IMGBTN_TILED == 0
-        lv_imgbtn_set_src(new_imgbtn, LV_BTN_STATE_REL, copy_ext->img_src[LV_BTN_STATE_REL]);
+        memset(ext->img_src, 0, sizeof(ext->img_src));
-        lv_imgbtn_set_src(new_imgbtn, LV_BTN_STATE_PR, copy_ext->img_src[LV_BTN_STATE_PR]);
+#else
-        lv_imgbtn_set_src(new_imgbtn, LV_BTN_STATE_TGL_REL, copy_ext->img_src[LV_BTN_STATE_TGL_REL]);
+        memcpy(ext->img_src_left, copy_ext->img_src_left, sizeof(ext->img_src_left));
-        lv_imgbtn_set_src(new_imgbtn, LV_BTN_STATE_TGL_PR, copy_ext->img_src[LV_BTN_STATE_TGL_PR]);
+        memcpy(ext->img_src_mid, copy_ext->img_src_mid, sizeof(ext->img_src_mid));
-        lv_imgbtn_set_src(new_imgbtn, LV_BTN_STATE_INA, copy_ext->img_src[LV_BTN_STATE_INA]);
+        memcpy(ext->img_src_right, copy_ext->img_src_right, sizeof(ext->img_src_right));
+#endif
         /*Refresh the style with new signal function*/
         lv_obj_refresh_style(new_imgbtn);
     }
@@ -98,6 +102,7 @@ lv_obj_t * lv_imgbtn_create(lv_obj_t * par, const lv_obj_t * copy)
  * Setter functions
  *====================*/
 
+#if LV_IMGBTN_TILED == 0
 /**
  * Set images for a state of the image button
  * @param imgbtn pointer to an image button object
@@ -113,6 +118,28 @@ void lv_imgbtn_set_src(lv_obj_t * imgbtn, lv_btn_state_t state, const void * src
     refr_img(imgbtn);
 }
 
+#else
+/**
+ * Set images for a state of the image button
+ * @param imgbtn pointer to an image button object
+ * @param state for which state set the new image (from `lv_btn_state_t`) `
+ * @param src_left pointer to an image source for the left side of the button (a C array or path to a file)
+ * @param src_mid pointer to an image source for the middle of the button (ideally 1px wide) (a C array or path to a file)
+ * @param src_right pointer to an image source for the right side of the button (a C array or path to a file)
+ */
+void lv_imgbtn_set_src(lv_obj_t * imgbtn, lv_btn_state_t state, const void * src_left, const void * src_mid, const void * src_right)
+{
+    lv_imgbtn_ext_t * ext = lv_obj_get_ext_attr(imgbtn);
+
+    ext->img_src_left[state] = src_left;
+    ext->img_src_mid[state] = src_mid;
+    ext->img_src_right[state] = src_right;
+
+    refr_img(imgbtn);
+}
+
+#endif
+
 /**
  * Set a style of a image button.
  * @param imgbtn pointer to image button object
@@ -138,7 +165,7 @@ const void * lv_imgbtn_get_src(lv_obj_t * imgbtn, lv_btn_state_t state)
 {
     lv_imgbtn_ext_t * ext = lv_obj_get_ext_attr(imgbtn);
 
-    return ext->img_src[state];
+    return NULL;//ext->img_src[state];
 }
 
 /**
@@ -191,10 +218,62 @@ static bool lv_imgbtn_design(lv_obj_t * imgbtn, const lv_area_t * mask, lv_desig
         /*Just draw an image*/
         lv_imgbtn_ext_t * ext = lv_obj_get_ext_attr(imgbtn);
         lv_btn_state_t state = lv_imgbtn_get_state(imgbtn);
-        const void * src = ext->img_src[state];
         lv_style_t * style = lv_imgbtn_get_style(imgbtn, state);
         lv_opa_t opa_scale = lv_obj_get_opa_scale(imgbtn);
+
+#if LV_IMGBTN_TILED == 0
+        const void * src = ext->img_src[state];
         lv_draw_img(&imgbtn->coords, mask, src, style, opa_scale);
+#else
+        const void * src;
+        lv_img_header_t header;
+        lv_area_t coords;
+        lv_coord_t left_w = 0;
+        lv_coord_t right_w = 0;
+
+        src = ext->img_src_left[state];
+        if(src) {
+            lv_img_dsc_get_info(src, &header);
+            left_w = header.w;
+            coords.x1 = imgbtn->coords.x1;
+            coords.y1 = imgbtn->coords.y1;
+            coords.x2 = coords.x1 + header.w - 1;
+            coords.y2 = coords.y1 + header.h - 1;
+            lv_draw_img(&coords, mask, src, style, opa_scale);
+        }
+
+        src = ext->img_src_right[state];
+        if(src) {
+            lv_img_dsc_get_info(src, &header);
+            right_w = header.w;
+            coords.x1 = imgbtn->coords.x2 - header.w + 1;
+            coords.y1 = imgbtn->coords.y1;
+            coords.x2 = imgbtn->coords.x2;
+            coords.y2 = imgbtn->coords.y1 + header.h - 1;
+            lv_draw_img(&coords, mask, src, style, opa_scale);
+        }
+
+        src = ext->img_src_mid[state];
+        if(src) {
+            lv_coord_t obj_w = lv_obj_get_width(imgbtn);
+            lv_coord_t i;
+            lv_img_dsc_get_info(src, &header);
+
+            coords.x1 = imgbtn->coords.x1 + left_w ;
+            coords.y1 = imgbtn->coords.y1;
+            coords.x2 = coords.x1 + header.w - 1;
+            coords.y2 = imgbtn->coords.y1 + header.h - 1;
+
+            for(i = 0; i < obj_w - right_w - left_w; i += header.w) {
+                lv_draw_img(&coords, mask, src, style, opa_scale);
+                coords.x1 = coords.x2 + 1;
+                coords.x2 += header.w;
+            }
+        }
+
+
+#endif
+
     }
     /*Post draw when the children are drawn*/
     else if(mode == LV_DESIGN_DRAW_POST) {
@@ -243,17 +322,27 @@ static void refr_img(lv_obj_t * imgbtn)
     lv_imgbtn_ext_t * ext = lv_obj_get_ext_attr(imgbtn);
     lv_btn_state_t state = lv_imgbtn_get_state(imgbtn);
     lv_img_header_t header;
+
+#if LV_IMGBTN_TILED == 0
     const void * src = ext->img_src[state];
+#else
+    const void * src = ext->img_src_mid[state];
+#endif
 
     lv_res_t info_res;
     info_res = lv_img_dsc_get_info(src, &header);
     if(info_res == LV_RES_OK) {
         ext->act_cf = header.cf;
+#if LV_IMGBTN_TILED == 0
         lv_obj_set_size(imgbtn, header.w, header.h);
+#else
+        lv_obj_set_height(imgbtn, header.h);
+#endif
     } else {
         ext->act_cf = LV_IMG_CF_UNKOWN;
     }
 
+
 }
 
 #endif

lv_objx/lv_imgbtn.h

@@ -41,7 +41,13 @@ extern "C" {
 typedef struct {
     lv_btn_ext_t btn; /*Ext. of ancestor*/
     /*New data for this type */
+#if LV_IMGBTN_TILED == 0
     const void * img_src[LV_BTN_STATE_NUM];       /*Store images to each state*/
+#else
+    const void * img_src_left[LV_BTN_STATE_NUM];       /*Store left side images to each state*/
+    const void * img_src_mid[LV_BTN_STATE_NUM];        /*Store center images to each state*/
+    const void * img_src_right[LV_BTN_STATE_NUM];      /*Store right side images to each state*/
+#endif
     lv_img_cf_t act_cf;           /*Color format of the currently active image*/
 } lv_imgbtn_ext_t;
 
@@ -78,6 +84,7 @@ lv_obj_t * lv_imgbtn_create(lv_obj_t * par, const lv_obj_t * copy);
  * Setter functions
  *====================*/
 
+#if LV_IMGBTN_TILED == 0
 /**
  * Set images for a state of the image button
  * @param imgbtn pointer to an image button object
@@ -85,6 +92,18 @@ lv_obj_t * lv_imgbtn_create(lv_obj_t * par, const lv_obj_t * copy);
  * @param src pointer to an image source (a C array or path to a file)
  */
 void lv_imgbtn_set_src(lv_obj_t * imgbtn, lv_btn_state_t state, const void * src);
+#else
+/**
+ * Set images for a state of the image button
+ * @param imgbtn pointer to an image button object
+ * @param state for which state set the new image (from `lv_btn_state_t`) `
+ * @param src_left pointer to an image source for the left side of the button (a C array or path to a file)
+ * @param src_mid pointer to an image source for the middle of the button (ideally 1px wide) (a C array or path to a file)
+ * @param src_right pointer to an image source for the right side of the button (a C array or path to a file)
+ */
+void lv_imgbtn_set_src(lv_obj_t * imgbtn, lv_btn_state_t state, const void * src_left, const void * src_mid, const void * src_right);
+
+#endif
 
 /**
  * Enable the toggled states. On release the button will change from/to toggled state.