[Genlist] add textblock style in 2text.1icon and dialogue/2text.1icon.6

diff --git a/themes/widgets/genlist/genlist_macro.edc b/themes/widgets/genlist/genlist_macro.edc
index 8703742..b965659 100755 (executable)
--- a/themes/widgets/genlist/genlist_macro.edc
+++ b/themes/widgets/genlist/genlist_macro.edc
@@ -3185,6 +3185,17 @@
       GENLIST_DESCRIPTION_SUBITEM_DEFAULT_OTHERS \
    )
 
+#define GENLIST_PART_SUBITEM_R_TB(NAME, HEIGHT, RIGHT) \
+   GENLIST_PART_TEXTBLOCK(NAME, \
+      GENLIST_DESCRIPTION_RTB(RIGHT, "elm.padding.top", "elm.padding.bottom", \
+         min: 0 HEIGHT; \
+         fixed: 1 0; \
+         GENLIST_PARAM_TEXT_LIMIT_RB \
+         GENLIST_PARAM_SUBITEM_DEFAULT_TB \
+      ) \
+      GENLIST_DESCRIPTION_SUBITEM_DEFAULT_OTHERS_TB \
+   )
+
 #define GENLIST_PART_SUBITEM_RB(NAME, HEIGHT, RIGHT, BOTTOM) \
    GENLIST_PART_TEXT(NAME, \
       GENLIST_DESCRIPTION_RB(RIGHT, BOTTOM, \

diff --git a/themes/widgets/genlist/genlist_normal.edc b/themes/widgets/genlist/genlist_normal.edc
index 86108f7..91fc4a4 100644 (file)
--- a/themes/widgets/genlist/genlist_normal.edc
+++ b/themes/widgets/genlist/genlist_normal.edc
@@ -590,6 +590,34 @@
       GENLIST_PROGRAM_SOUND("elm.text.2")
    }
 
+// 2.2.1.11 (textblock)
+   group { GENLIST_NAME("2text.1icon.tb/default")
+      alias: "elm/genlist/item/2text.1icon.6.tb/default";
+      GENLIST_PROLOG_NORMAL
+      data.item: "texts" "elm.text.1 elm.text.2";
+      data.item: "contents" "elm.icon";
+
+      parts {
+         GENLIST_PART_BASE
+         GENLIST_PART_BG_NORMAL
+         GENLIST_PART_BOTTOM_LINE
+         GENLIST_PART_PADDING_LEFT
+         GENLIST_PART_PADDING_RIGHT
+         GENLIST_PART_PADDING_TOP
+         GENLIST_PART_PADDING_BOTTOM
+
+         GENLIST_PART_ICON_BIG_L("elm.icon", "elm.padding.left")
+         GENLIST_PART_PADDING_L("elm.padding.icon.right", "elm.icon")
+         GENLIST_PART_LISTITEM_LR_TB("elm.text.1", GENLIST_HEIGHT_1LINE, "elm.padding.icon.right", "elm.text.2",)
+         GENLIST_PART_SUBITEM_R_TB("elm.text.2", GENLIST_HEIGHT_1LINE, "elm.padding.right")
+         GENLIST_PART_FLIP
+         GENLIST_PART_FOCUS_NORMAL
+      }
+      GENLIST_PROGRAMS_NORMAL( target: "elm.text.1"; target: "elm.text.2"; target: "elm.icon"; )
+      GENLIST_PROGRAM_SOUND("elm.text.1")
+      GENLIST_PROGRAM_SOUND("elm.text.2")
+   }
+
 // 2.2.1.12
    group { GENLIST_NAME("2text.1icon.6/default")
       inherit: "elm/genlist/item/2text.1icon/default";
@@ -3237,6 +3265,17 @@
       GENLIST_PROGRAMS_DIALOGUE( target: "elm.text.1"; target: "elm.text.2"; target: "elm.icon"; )
    }
 
+// 2.4.1.5 (textblock)
+   group { GENLIST_NAME("dialogue/2text.1icon.6.tb/default")
+      alias: "elm/layout/dialogue/2text.1icon.6.tb";
+      inherit: "elm/genlist/item/2text.1icon.tb/default";
+
+      data.item: "contents" "elm.icon elm.icon.edit";
+
+      GENLIST_DIALOGUE_INHERIT_BODY( ; )
+      GENLIST_PROGRAMS_DIALOGUE( target: "elm.text.1"; target: "elm.text.2"; target: "elm.icon"; )
+   }
+
 // 2.4.1.6
 // 2.4.1.15
 // 2.5.2.2 & 2.5.2.3 (expandable)
@@ -4360,6 +4399,7 @@ GENLIST_POPUP_STYLE("1text.2icon.3.tb")
 GENLIST_POPUP_STYLE("1text.1icon.2")
 GENLIST_POPUP_STYLE("1text.1icon.2.tb")
 GENLIST_POPUP_STYLE("2text.1icon")
+GENLIST_POPUP_STYLE("2text.1icon.tb")
 GENLIST_POPUP_STYLE("1text.2icon")
 GENLIST_POPUP_STYLE("1text.2icon.tb")
 GENLIST_POPUP_STYLE("1text.2icon.6")