add widget_prepare_text_style and refactor

src/base/widget.c

@@ -26,6 +26,7 @@
 #include "base/enums.h"
 #include "base/locale.h"
 #include "base/widget.h"
+#include "base/system_info.h"
 #include "base/widget_vtable.h"
 #include "base/image_manager.h"
 
@@ -429,16 +430,15 @@ ret_t widget_off_by_func(widget_t* widget, event_type_t type, event_func_t on_ev
 }
 
 ret_t widget_draw_icon_text(widget_t* widget, canvas_t* c, const char* icon, wstr_t* text) {
-  xy_t x = 0;
+  rect_t r;
-  xy_t y = 0;
-  wh_t w = 0;
-  rect_t dst;
   bitmap_t img;
   style_t* style = &(widget->style);
-  color_t trans = color_init(0, 0, 0, 0);
+  int32_t margin = style_get_int(style, STYLE_ID_MARGIN, 2);
-  color_t tc = style_get_color(style, STYLE_ID_TEXT_COLOR, trans);
   uint16_t font_size = style_get_int(style, STYLE_ID_FONT_SIZE, TK_DEFAULT_FONT_SIZE);
 
+  wh_t w = widget->w - 2 * margin;
+  wh_t h = widget->h - 2 * margin;
+
   if (text == NULL) {
     text = &(widget->text);
   }
@@ -447,75 +447,35 @@ ret_t widget_draw_icon_text(widget_t* widget, canvas_t* c, const char* icon, wst
     icon = style_get_str(style, STYLE_ID_ICON, NULL);
   }
 
-  if (text != NULL && text->size > 0) {
+  widget_prepare_text_style(widget, c);
-    const char* font_name = style_get_str(style, STYLE_ID_FONT_NAME, NULL);
+  font_size = style_get_int(style, STYLE_ID_FONT_SIZE, TK_DEFAULT_FONT_SIZE);
-
-    canvas_set_text_color(c, tc);
-    canvas_set_font(c, font_name, font_size);
-  }
-
   if (icon != NULL && image_manager_load(image_manager(), icon, &img) == RET_OK) {
-    xy_t cx = 0;
+    float_t dpr = system_info()->device_pixel_ratio;
-    xy_t cy = 0;
 
     if (text != NULL && text->size > 0) {
-      if (widget->h > (img.h + font_size)) {
+      if (h > (img.h / dpr + font_size)) {
-        dst = rect_init(0, 0, widget->w, widget->h - font_size);
+        int text_h = font_size + margin;
-        cx = dst.w >> 1;
+        int text_y = widget->h - text_h;
-        cy = dst.h >> 1;
-        canvas_draw_icon(c, &img, cx, cy);
 
-        w = canvas_measure_text(c, text->str, text->size);
+        r = rect_init(0, 0, widget->w, text_y);
-        x = (widget->w - w) >> 1;
+        canvas_draw_icon_in_rect(c, &img, &r);
-        y = widget->h - font_size;
+
-        canvas_draw_text(c, text->str, text->size, x, y);
+        r = rect_init(margin, text_y, w, text_h);
       } else {
-        dst = rect_init(0, 0, widget->h, widget->h);
+        r = rect_init(0, 0, widget->h, widget->h);
-        cx = dst.w >> 1;
+        canvas_draw_icon_in_rect(c, &img, &r);
-        cy = dst.h >> 1;
-        canvas_draw_icon(c, &img, cx, cy);
 
-        x = widget->h + 2;
+        canvas_set_text_align(c, ALIGN_H_LEFT, ALIGN_V_MIDDLE);
-        y = (widget->h - font_size) >> 1;
+        r = rect_init(widget->h, margin, widget->w - widget->h - margin, h);
-        canvas_draw_text(c, text->str, text->size, x, y);
       }
+      canvas_draw_text_in_rect(c, text->str, text->size, &r);
     } else {
-      dst = rect_init(0, 0, widget->w, widget->h);
+      r = rect_init(0, 0, widget->w, widget->h);
-      cx = dst.w >> 1;
+      canvas_draw_icon_in_rect(c, &img, &r);
-      cy = dst.h >> 1;
-      canvas_draw_icon(c, &img, cx, cy);
     }
   } else if (text != NULL && text->size > 0) {
-    int32_t align_h = style_get_int(style, STYLE_ID_TEXT_ALIGN_H, ALIGN_H_CENTER);
+    r = rect_init(margin, margin, w, h);
-    int32_t align_v = style_get_int(style, STYLE_ID_TEXT_ALIGN_V, ALIGN_V_MIDDLE);
+    canvas_draw_text_in_rect(c, text->str, text->size, &r);
-    int32_t margin = style_get_int(style, STYLE_ID_MARGIN, 2);
-
-    w = canvas_measure_text(c, text->str, text->size);
-    switch (align_v) {
-      case ALIGN_V_TOP:
-        y = margin;
-        break;
-      case ALIGN_V_BOTTOM:
-        y = widget->h - margin - font_size;
-        break;
-      default:
-        y = (widget->h - font_size) >> 1;
-        break;
-    }
-
-    switch (align_h) {
-      case ALIGN_H_LEFT:
-        x = margin;
-        break;
-      case ALIGN_H_RIGHT:
-        x = widget->w - margin - w;
-        break;
-      default:
-        x = (widget->w - w) >> 1;
-        break;
-    }
-
-    canvas_draw_text(c, text->str, text->size, x, y);
   }
 
   return RET_OK;
@@ -1255,3 +1215,19 @@ ret_t widget_to_xml(widget_t* widget) {
 
   return RET_OK;
 }
+
+ret_t widget_prepare_text_style(widget_t* widget, canvas_t* c) {
+  style_t* style = &(widget->style);
+  color_t trans = color_init(0, 0, 0, 0);
+  color_t tc = style_get_color(style, STYLE_ID_TEXT_COLOR, trans);
+  const char* font_name = style_get_str(style, STYLE_ID_FONT_NAME, NULL);
+  uint16_t font_size = style_get_int(style, STYLE_ID_FONT_SIZE, TK_DEFAULT_FONT_SIZE);
+  align_h_t align_h = (align_h_t)style_get_int(style, STYLE_ID_TEXT_ALIGN_H, ALIGN_H_CENTER);
+  align_v_t align_v = (align_v_t)style_get_int(style, STYLE_ID_TEXT_ALIGN_V, ALIGN_V_MIDDLE);
+
+  canvas_set_text_color(c, tc);
+  canvas_set_font(c, font_name, font_size);
+  canvas_set_text_align(c, align_h, align_v);
+
+  return RET_OK;
+}

src/base/widget.h

@@ -876,6 +876,17 @@ typedef widget_t* (*widget_create_t)(widget_t* parent, xy_t x, xy_t y, wh_t w, w
  */
 ret_t widget_paint_helper(widget_t* widget, canvas_t* c, const char* icon, wstr_t* text);
 
+/**
+ * @method widget_prepare_text_style
+ * 从widget的style中取出字体名称、大小和颜色数据，设置到canvas中。
+ * @private
+ * @param {widget_t*} widget 控件对象。
+ * @param {canvas_t*} c 画布对象。
+ *
+ * @return {ret_t} 返回RET_OK表示成功，否则表示失败。
+ */
+ret_t widget_prepare_text_style(widget_t* widget, canvas_t* c);
+
 END_C_DECLS
 
 #endif /*TK_WIDGET_H*/