[gengrid] UX 1.3 & 1.4 implementation. Macros and images are added.

Change-Id: I971113c184052178035f5a1c9bded111465f482a

diff --git a/themes/inc/tizen-hd-inc.edc b/themes/inc/tizen-hd-inc.edc
index 0c5df16..d9dc175 100644 (file)
--- a/themes/inc/tizen-hd-inc.edc
+++ b/themes/inc/tizen-hd-inc.edc
@@ -114,9 +114,26 @@
 #define GENGRID_FONT_STYLE_18_INC "26"
 #define GENGRID_PART_BG_COLOR_INC 0 0 0 0
 #define GENGRID_PART_ITEM_BG_COLOR_INC 239 239 239 255
+#define GENGRID_PART_REORDER_DEFAULT_BG_COLOR_INC 0 0 0 128
 #define GENGRID_PART_REORDER_BG_COLOR_INC 0 0 0 128
 #define GENGRID_PART_TEXTBLOCK_STYLE_COLOR_INC "#F9F9F9"
 
+#define GENGRID_GRID_TEXT_LEFT_TOP_PADDING_INC 8 18
+#define GENGRID_GRID_TEXT_RIGHT_BOTTOM_PADDING_INC 8 72
+#define GENGRID_GRID_TEXT_ITEM_BG_LEFT_TOP_PADDING_INC 2 0
+#define GENGRID_GRID_TEXT_ITEM_BG_RIGHT_BOTTOM_PADDING_INC 2 6
+#define GENGRID_GRID_TEXT_ITEM_REAL_BG_RIGHT_PADDING_INC 2 2
+#define GENGRID_GRID_TEXT_LEFT_TOP_FOCUS_PADDING_INC 8 16
+#define GENGRID_GRID_TEXT_RIGHT_BOTTOM_FOCUS_PADDING_INC 8 76
+
+#define GENGRID_GRID_TEXT2_LEFT_TOP_PADDING_INC 8 74
+#define GENGRID_GRID_TEXT2_RIGHT_BOTTOM_PADDING_INC 8 0
+#define GENGRID_GRID_TEXT2_ITEM_BG_LEFT_TOP_PADDING_INC 2 0
+#define GENGRID_GRID_TEXT2_ITEM_BG_RIGHT_BOTTOM_PADDING_INC 2 6
+#define GENGRID_GRID_TEXT2_ITEM_REAL_BG_RIGHT_PADDING_INC 2 2
+#define GENGRID_GRID_TEXT2_LEFT_TOP_FOCUS_PADDING_INC 8 72
+#define GENGRID_GRID_TEXT2_RIGHT_BOTTOM_FOCUS_PADDING_INC 8 4
+
 #define GENLIST_ICON_BIG_SIZE     64
 #define GENLIST_ICON_SIZE_64 64
 

diff --git a/themes/widgets/gengrid.edc b/themes/widgets/gengrid.edc
index 94263d1..5e18cc7 100644 (file)
--- a/themes/widgets/gengrid.edc
+++ b/themes/widgets/gengrid.edc
@@ -181,7 +181,7 @@
             }\r
             description { state: "enabled" 0.0;\r
                inherit: "default" 0.0;\r
-               color: GENGRID_PART_REORDER_BG_COLOR_INC;\r
+               color: GENGRID_PART_REORDER_DEFAULT_BG_COLOR_INC;\r
             }\r
          }\r
          part { name: "focus_bg_left_top_padding";\r
@@ -272,6 +272,7 @@
       images {\r
          image : "00_winset_thumbs_bg.png" COMP;\r
          image : "00_winset_thumbs_focus_bg.png" COMP;\r
+         image : "00_winset_thumbs_loading_bg.png" COMP;\r
       }\r
       parts {\r
          part { name: "bg";\r
@@ -284,7 +285,7 @@
             type: RECT;\r
             scale : 1;\r
             description { state: "default" 0.0;\r
-               min: 8 18;\r
+               min: GENGRID_GRID_TEXT_LEFT_TOP_PADDING_INC;\r
                align: 0.0 0.0;\r
                visible: 0;\r
                rel1.to: "bg";\r
@@ -298,7 +299,7 @@
             type: RECT;\r
             scale: 1;\r
             description { state: "default" 0.0;\r
-               min: 8 72;\r
+               min: GENGRID_GRID_TEXT_RIGHT_BOTTOM_PADDING_INC;\r
                align: 1.0 1.0;\r
                visible: 0;\r
                rel1 {\r
@@ -355,7 +356,7 @@
             type: RECT;\r
             scale : 1;\r
             description { state: "default" 0.0;\r
-               min: 2 0;\r
+               min: GENGRID_GRID_TEXT_ITEM_BG_LEFT_TOP_PADDING_INC;\r
                align: 0.0 0.0;\r
                visible: 0;\r
                rel1.to: "item_bg";\r
@@ -369,7 +370,7 @@
             type: RECT;\r
             scale : 1;\r
             description { state: "default" 0.0;\r
-               min: 2 6;\r
+               min: GENGRID_GRID_TEXT_ITEM_BG_RIGHT_BOTTOM_PADDING_INC;\r
                align: 1.0 1.0;\r
                visible: 0;\r
                rel1 {\r
@@ -380,9 +381,7 @@
             }\r
          }\r
          part { name: "item_real_bg";\r
-            type: RECT;\r
             description { state: "default" 0.0;\r
-               color: 190 189 189 255;\r
                rel1 {\r
                   relative: 1.0 1.0;\r
                   to: "item_bg_left_top_padding";\r
@@ -391,13 +390,14 @@
                   relative: 0.0 0.0;\r
                   to: "item_bg_right_bottom_padding";\r
                }\r
+               image.normal: "00_winset_thumbs_loading_bg.png";\r
             }\r
          }\r
          part { name: "item_real_bg_left_top_padding";\r
             type: RECT;\r
             scale : 1;\r
             description { state: "default" 0.0;\r
-               min: 2 2;\r
+               min: GENGRID_GRID_TEXT_ITEM_REAL_BG_RIGHT_PADDING_INC;\r
                align: 0.0 0.0;\r
                visible: 0;\r
                rel1.to: "item_real_bg";\r
@@ -411,7 +411,7 @@
             type: RECT;\r
             scale : 1;\r
             description { state: "default" 0.0;\r
-               min: 2 2;\r
+               min: GENGRID_GRID_TEXT_ITEM_REAL_BG_RIGHT_PADDING_INC;\r
                align: 1.0 1.0;\r
                visible: 0;\r
                rel1 {\r
@@ -458,7 +458,7 @@
             type: RECT;\r
             scale : 1;\r
             description { state: "default" 0.0;\r
-               min: 8 16;\r
+               min: GENGRID_GRID_TEXT_LEFT_TOP_FOCUS_PADDING_INC;\r
                align: 0.0 0.0;\r
                visible: 0;\r
                rel1.to: "bg";\r
@@ -472,7 +472,7 @@
             type: RECT;\r
             scale: 1;\r
             description { state: "default" 0.0;\r
-               min: 8 76;\r
+               min: GENGRID_GRID_TEXT_RIGHT_BOTTOM_FOCUS_PADDING_INC;\r
                align: 1.0 1.0;\r
                visible: 0;\r
                rel1 {\r
@@ -554,7 +554,7 @@
             type: RECT;\r
             scale : 1;\r
             description { state: "default" 0.0;\r
-               min: 8 74;\r
+               min: GENGRID_GRID_TEXT2_LEFT_TOP_PADDING_INC;\r
                align: 0.0 0.0;\r
                visible: 0;\r
                rel1.to: "bg";\r
@@ -568,7 +568,7 @@
             type: RECT;\r
             scale: 1;\r
             description { state: "default" 0.0;\r
-               min: 8 0;\r
+               min: GENGRID_GRID_TEXT2_RIGHT_BOTTOM_PADDING_INC;\r
                align: 1.0 1.0;\r
                visible: 0;\r
                rel1 {\r
@@ -625,7 +625,7 @@
             type: RECT;\r
             scale : 1;\r
             description { state: "default" 0.0;\r
-               min: 2 0;\r
+               min: GENGRID_GRID_TEXT2_ITEM_BG_LEFT_TOP_PADDING_INC;\r
                align: 0.0 0.0;\r
                visible: 0;\r
                rel1.to: "item_bg";\r
@@ -639,7 +639,7 @@
             type: RECT;\r
             scale : 1;\r
             description { state: "default" 0.0;\r
-               min: 2 6;\r
+               min: GENGRID_GRID_TEXT2_ITEM_BG_RIGHT_BOTTOM_PADDING_INC;\r
                align: 1.0 1.0;\r
                visible: 0;\r
                rel1 {\r
@@ -650,9 +650,7 @@
             }\r
          }\r
          part { name: "item_real_bg";\r
-            type: RECT;\r
             description { state: "default" 0.0;\r
-               color: 190 189 189 255;\r
                rel1 {\r
                   relative: 1.0 1.0;\r
                   to: "item_bg_left_top_padding";\r
@@ -661,13 +659,14 @@
                   relative: 0.0 0.0;\r
                   to: "item_bg_right_bottom_padding";\r
                }\r
+               image.normal: "00_winset_thumbs_loading_bg.png";\r
             }\r
          }\r
          part { name: "item_real_bg_left_top_padding";\r
             type: RECT;\r
             scale : 1;\r
             description { state: "default" 0.0;\r
-               min: 2 2;\r
+               min: GENGRID_GRID_TEXT2_ITEM_REAL_BG_RIGHT_PADDING_INC;\r
                align: 0.0 0.0;\r
                visible: 0;\r
                rel1.to: "item_real_bg";\r
@@ -681,7 +680,7 @@
             type: RECT;\r
             scale : 1;\r
             description { state: "default" 0.0;\r
-               min: 2 2;\r
+               min: GENGRID_GRID_TEXT2_ITEM_REAL_BG_RIGHT_PADDING_INC;\r
                align: 1.0 1.0;\r
                visible: 0;\r
                rel1 {\r
@@ -728,7 +727,7 @@
             type: RECT;\r
             scale : 1;\r
             description { state: "default" 0.0;\r
-               min: 8 72;\r
+               min: GENGRID_GRID_TEXT2_LEFT_TOP_FOCUS_PADDING_INC;\r
                align: 0.0 0.0;\r
                visible: 0;\r
                rel1.to: "bg";\r
@@ -742,7 +741,7 @@
             type: RECT;\r
             scale: 1;\r
             description { state: "default" 0.0;\r
-               min: 8 4;\r
+               min: GENGRID_GRID_TEXT2_RIGHT_BOTTOM_FOCUS_PADDING_INC;\r
                align: 1.0 1.0;\r
                visible: 0;\r
                rel1 {\r