projects / platform / core / uifw / efl-theme-tizen.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: faf87ce)
[Genlist] Apply UX 4.8
authorTae-Hwan Kim <the81.kim@samsung.com>
Tue, 30 Apr 2013 09:47:33 +0000 (18:47 +0900)
committerSungho Kwak <sungho1.kwak@samsung.com>
Wed, 12 Jun 2013 11:10:54 +0000 (20:10 +0900)
Add Dialogue Focus

Change-Id: I83d0d8298cac11ed4d791a9d0684d9f1d33fc49d

themes/images/tizen-hd/Focus/00_list_group_bg_bottom_focus.png [new file with mode: 0644] patch | blob
themes/images/tizen-hd/Focus/00_list_group_bg_center_focus.png [new file with mode: 0644] patch | blob
themes/images/tizen-hd/Focus/00_list_group_bg_top_focus.png [new file with mode: 0644] patch | blob
themes/widgets/genlist/genlist_expandable.edc patch | blob | history
themes/widgets/genlist/genlist_groupindex.edc patch | blob | history
themes/widgets/genlist/genlist_macro.edc patch | blob | history
themes/widgets/genlist/genlist_normal.edc patch | blob | history

diff --git a/themes/images/tizen-hd/Focus/00_list_group_bg_bottom_focus.png b/themes/images/tizen-hd/Focus/00_list_group_bg_bottom_focus.png
new file mode 100644 (file)
index 0000000..8f5de41
Binary files /dev/null and b/themes/images/tizen-hd/Focus/00_list_group_bg_bottom_focus.png differ
diff --git a/themes/images/tizen-hd/Focus/00_list_group_bg_center_focus.png b/themes/images/tizen-hd/Focus/00_list_group_bg_center_focus.png
new file mode 100644 (file)
index 0000000..4f5e9f4
Binary files /dev/null and b/themes/images/tizen-hd/Focus/00_list_group_bg_center_focus.png differ
diff --git a/themes/images/tizen-hd/Focus/00_list_group_bg_top_focus.png b/themes/images/tizen-hd/Focus/00_list_group_bg_top_focus.png
new file mode 100644 (file)
index 0000000..6c27ae6
Binary files /dev/null and b/themes/images/tizen-hd/Focus/00_list_group_bg_top_focus.png differ
diff --git a/themes/widgets/genlist/genlist_expandable.edc b/themes/widgets/genlist/genlist_expandable.edc
index f36d3e1..7d68196 100644 (file)
--- a/themes/widgets/genlist/genlist_expandable.edc
+++ b/themes/widgets/genlist/genlist_expandable.edc
@@ -52,7 +52,7 @@
          GENLIST_PART_PADDING_R("elm.padding.arrow.left", "arrow")
          GENLIST_PART_EXPANDABLE_ARROW
          GENLIST_PART_FLIP
-         GENLIST_PART_FOCUS
+         GENLIST_PART_FOCUS_DIALOGUE
       }
       GENLIST_PROGRAMS_DIALOGUE( target: "elm.text.1"; target: "elm.text.2"; target: "arrow_clip"; )
       programs {
@@ -95,7 +95,7 @@
          GENLIST_PART_PADDING_R("elm.padding.arrow.left", "arrow")
          GENLIST_PART_EXPANDABLE_ARROW
          GENLIST_PART_FLIP
-         GENLIST_PART_FOCUS
+         GENLIST_PART_FOCUS_DIALOGUE
       }
       GENLIST_PROGRAMS_DIALOGUE( target: "elm.text.1"; target: "elm.text.2";  target: "arrow_clip"; )
       programs {
@@ -137,7 +137,7 @@
          GENLIST_PART_PADDING_R("elm.padding.arrow.left", "arrow")
          GENLIST_PART_EXPANDABLE_ARROW
          GENLIST_PART_FLIP
-         GENLIST_PART_FOCUS
+         GENLIST_PART_FOCUS_DIALOGUE
       }
       GENLIST_PROGRAMS_DIALOGUE( target: "elm.text.1"; target: "elm.text.2"; target: "arrow_clip"; )
       programs {
@@ -188,7 +188,7 @@
          GENLIST_PART_PADDING_R("elm.padding.arrow.left", "arrow")
          GENLIST_PART_EXPANDABLE_ARROW
          GENLIST_PART_FLIP
-         GENLIST_PART_FOCUS
+         GENLIST_PART_FOCUS_DIALOGUE
       }
       GENLIST_PROGRAMS_DIALOGUE( target: "elm.text.1"; target: "elm.text.2"; target: "arrow_clip"; )
       programs {
@@ -243,7 +243,7 @@
          GENLIST_PART_PADDING_R("elm.padding.arrow.left", "arrow")
          GENLIST_PART_EXPANDABLE_ARROW
          GENLIST_PART_FLIP
-         GENLIST_PART_FOCUS
+         GENLIST_PART_FOCUS_DIALOGUE
       }
       GENLIST_PROGRAMS_DIALOGUE( target: "elm.icon"; target: "elm.text.1"; target: "elm.text.2"; target: "elm.text.3";
           target: "arrow_clip"; )
@@ -287,7 +287,7 @@
          GENLIST_PART_PADDING_R("elm.padding.arrow.left", "arrow")
          GENLIST_PART_EXPANDABLE_ARROW
          GENLIST_PART_FLIP
-         GENLIST_PART_FOCUS
+         GENLIST_PART_FOCUS_DIALOGUE
       }
       GENLIST_PROGRAMS_DIALOGUE( target: "elm.text";  target: "arrow_clip"; )
       programs {
diff --git a/themes/widgets/genlist/genlist_groupindex.edc b/themes/widgets/genlist/genlist_groupindex.edc
index 5a573ab..895e483 100644 (file)
--- a/themes/widgets/genlist/genlist_groupindex.edc
+++ b/themes/widgets/genlist/genlist_groupindex.edc
@@ -102,12 +102,10 @@
             GENLIST_DESCRIPTION_INDEX_LIST
          )
          GENLIST_PART_INDEX_LINE("elm.padding.left", "elm.padding.right", "elm.text", "elm.padding.bottom")
-         GENLIST_PART_FOCUS
       }
       programs {
          GENLIST_PROGRAM_DISABLED( target: "elm.text"; target: "index_line"; )
          GENLIST_PROGRAM_SELECT( target: "elm.text"; target: "index_line"; target: "bg"; )
-         GENLIST_PROGRAM_FOCUS
       }
    }
 
@@ -151,12 +149,10 @@
             GENLIST_DESCRIPTION_INDEX_LIST
          )
          GENLIST_PART_INDEX_LINE("elm.padding.icon.right", "elm.padding.right", "elm.text", "elm.padding.bottom")
-         GENLIST_PART_FOCUS
       }
       programs {
          GENLIST_PROGRAM_DISABLED( target: "elm.text"; target: "index_line"; )
          GENLIST_PROGRAM_SELECT( target: "elm.text"; target: "index_line"; target: "bg"; )
-         GENLIST_PROGRAM_FOCUS
       }
    }
 
diff --git a/themes/widgets/genlist/genlist_macro.edc b/themes/widgets/genlist/genlist_macro.edc
index d4d7315..a6faaa7 100644 (file)
--- a/themes/widgets/genlist/genlist_macro.edc
+++ b/themes/widgets/genlist/genlist_macro.edc
@@ -372,6 +372,9 @@
          image : "00_list_group_bg_center_press.png" COMP; \
          image : "00_list_group_bg_bottom.png" COMP; \
          image : "00_list_group_bg_bottom_press.png" COMP; \
+         image : "00_list_group_bg_top_focus.png" COMP; \
+         image : "00_list_group_bg_center_focus.png" COMP; \
+         image : "00_list_group_bg_bottom_focus.png" COMP; \
       }
 
 #define GENLIST_NAME(NAME) \
@@ -397,6 +400,7 @@
          GENLIST_PART_PADDING_RIGHT_EDIT \
          _PARTS \
          GENLIST_PART_FLIP \
+         GENLIST_PART_FOCUS_DIALOGUE \
       }
 
 #define GENLIST_INHERIT_THUMB_CIRCLE(SIZE_PREFIX, MASK_SIZE, PARENT) \
@@ -926,6 +930,46 @@
       } \
    )
 
+#define GENLIST_PART_FOCUS_DIALOGUE \
+   GENLIST_PART_IMAGE("focus_part", \
+      mouse_events: 0; \
+      GENLIST_DESCRIPTION_LR("bg_dialogue_left", "bg_dialogue_right", \
+         visible: 0; \
+         image { \
+            normal: "00_focus.png"; \
+            border: 7 7 7 7; \
+         } \
+      ) \
+      description { state: "focused" 0.0; \
+         inherit: "default" 0.0; \
+         visible: 1; \
+      } \
+      description { state: "top_focused" 0.0; \
+         inherit: "default" 0.0; \
+         visible: 1; \
+         image { \
+            normal: "00_list_group_bg_top_focus.png"; \
+            border: 7 7 7 7; \
+         } \
+      } \
+      description { state: "center_focused" 0.0; \
+         inherit: "default" 0.0; \
+         visible: 1; \
+         image { \
+            normal: "00_list_group_bg_center_focus.png"; \
+            border: 7 7 7 7; \
+         } \
+      } \
+      description { state: "bottom_focused" 0.0; \
+         inherit: "default" 0.0; \
+         visible: 1; \
+         image { \
+            normal: "00_list_group_bg_bottom_focus.png"; \
+            border: 7 7 7 7; \
+         } \
+      } \
+   )
+
 //****************************************************************************//
 // ****************************** LINE ********************************//
 //****************************************************************************//
@@ -1699,6 +1743,31 @@
          target: "focus_part"; \
       }
 
+#define GENLIST_PROGRAM_FOCUS_DIALOGUE \
+      program { name: "focused"; \
+         signal: "elm,state,focused"; \
+         source: "elm"; \
+         script { \
+            new st[31]; \
+            new Float:vl; \
+            get_state(PART:"bg_dialogue", st, 30, vl); \
+            if (!strcmp(st, "top") || !strcmp(st, "top_selected")) \
+               set_state(PART:"focus_part", "top_focused", 0.0); \
+            else if (!strcmp(st, "center") || !strcmp(st, "center_selected")) \
+               set_state(PART:"focus_part", "center_focused", 0.0); \
+            else if (!strcmp(st, "bottom") || !strcmp(st, "bottom_selected")) \
+               set_state(PART:"focus_part", "bottom_focused", 0.0); \
+            else if (!strcmp(st, "default") || !strcmp(st, "selected")) \
+               set_state(PART:"focus_part", "focused", 0.0); \
+         } \
+      } \
+      program { name: "unfocused"; \
+         signal: "elm,state,unfocused"; \
+         source: "elm"; \
+         action: STATE_SET "default" 0.0; \
+         target: "focus_part"; \
+      }
+
 #define GENLIST_PROGRAM_SOUND( SRC ) \
          program { name: "play_sound"SRC; \
             signal: "mouse,clicked,1"; \
@@ -2121,7 +2190,7 @@
          target: "elm.padding.right"; \
       ) \
       GENLIST_PROGRAM_DISABLED( TARGET ) \
-      GENLIST_PROGRAM_FOCUS \
+      GENLIST_PROGRAM_FOCUS_DIALOGUE \
       GENLIST_PROGRAM_SELECT_DIALOGUE( TARGET ) \
       program { name: "bg_color_change"; \
          signal: "bg_color_change"; \
diff --git a/themes/widgets/genlist/genlist_normal.edc b/themes/widgets/genlist/genlist_normal.edc
index 1ad72ed..fb96238 100644 (file)
--- a/themes/widgets/genlist/genlist_normal.edc
+++ b/themes/widgets/genlist/genlist_normal.edc
@@ -3111,9 +3111,7 @@
                max: -1 32;
             }
          )
-         GENLIST_PART_FOCUS
       }
-      GENLIST_PROGRAM_FOCUS
    }
 
 // Dialogue Group Separators
@@ -3132,9 +3130,7 @@
                max: -1 8;
             }
          )
-         GENLIST_PART_FOCUS
       }
-      GENLIST_PROGRAM_FOCUS
    }
 
    group { GENLIST_NAME("dialogue/1icon/default")
@@ -3325,7 +3321,7 @@
          GENLIST_PART_PADDING_R("elm.padding.icon3.left", "elm.icon.3")
          GENLIST_PART_ICON_BIG_R("elm.icon.3", "elm.padding.right")
          GENLIST_PART_FLIP
-         GENLIST_PART_FOCUS
+         GENLIST_PART_FOCUS_DIALOGUE
       }
       GENLIST_PROGRAMS_DIALOGUE( target: "elm.icon.1"; target: "elm.icon.2";
          target: "elm.icon.3"; )
@@ -3357,7 +3353,7 @@
             )
          )
          GENLIST_PART_FLIP
-         GENLIST_PART_FOCUS
+         GENLIST_PART_FOCUS_DIALOGUE
       }
       GENLIST_PROGRAMS_DIALOGUE( target: "elm.text"; target: "elm.icon"; )
       GENLIST_PROGRAM_SOUND("elm.text")
@@ -3394,7 +3390,7 @@
             )
          )
          GENLIST_PART_FLIP
-         GENLIST_PART_FOCUS
+         GENLIST_PART_FOCUS_DIALOGUE
       }
       GENLIST_PROGRAMS_DIALOGUE( target: "elm.text.1"; target: "elm.text.2";
          target: "elm.icon"; )
@@ -3433,7 +3429,7 @@
             )
          )
          GENLIST_PART_FLIP
-         GENLIST_PART_FOCUS
+         GENLIST_PART_FOCUS_DIALOGUE
       }
       GENLIST_PROGRAMS_DIALOGUE( target: "elm.text.1"; target: "elm.text.2";
          target: "elm.icon"; )
@@ -3955,7 +3951,7 @@
             )
          )
          GENLIST_PART_FLIP
-         GENLIST_PART_FOCUS
+         GENLIST_PART_FOCUS_DIALOGUE
       }
       GENLIST_PROGRAMS_DIALOGUE( target: "elm.text.1";
          target: "elm.text.2"; target: "elm.icon"; )
@@ -4013,7 +4009,7 @@
             GENLIST_DESCRIPTION_SUBITEM_SETTINGS_OTHERS
          )
          GENLIST_PART_FLIP
-         GENLIST_PART_FOCUS
+         GENLIST_PART_FOCUS_DIALOGUE
       }
       GENLIST_PROGRAMS_DIALOGUE( target: "elm.text.1"; target: "elm.text.2"; target: "elm.icon"; )
       GENLIST_PROGRAM_SOUND("elm.text.1")
@@ -4082,10 +4078,8 @@
             )
          )
          GENLIST_PART_FLIP
-         GENLIST_PART_FOCUS
       }
       GENLIST_PROGRAM_DISABLED( target: "elm.text"; target: "elm.icon"; )
-      GENLIST_PROGRAM_FOCUS
    }
 
 // 2.4.4.2 Help Text
@@ -4156,7 +4150,7 @@
             )
          )
          GENLIST_PART_FLIP
-         GENLIST_PART_FOCUS
+         GENLIST_PART_FOCUS_DIALOGUE
       }
       GENLIST_PROGRAMS_DIALOGUE( target: "elm.text.1"; target: "elm.text.2"; target: "elm.icon"; )
    }
@@ -4206,7 +4200,7 @@
             )
          )
          GENLIST_PART_FLIP
-         GENLIST_PART_FOCUS
+         GENLIST_PART_FOCUS_DIALOGUE
       }
       GENLIST_PROGRAMS_DIALOGUE( target: "elm.text.1"; target: "elm.text.2"; target: "elm.text.3";
          target: "elm.icon.1"; target: "elm.icon.2"; )
@@ -4291,7 +4285,7 @@
             min: 0 32; fixed: 0 1;)
          )
          GENLIST_PART_FLIP
-         GENLIST_PART_FOCUS
+         GENLIST_PART_FOCUS_DIALOGUE
       }
       GENLIST_PROGRAMS_DIALOGUE( target: "elm.text.1"; target: "elm.text.2"; target: "elm.text.3"; target: "elm.text.4"; target: "elm.text.5";
          target: "elm.icon.1"; target: "elm.icon.2"; target: "elm.icon.3"; target: "elm.icon.4"; target: "elm.icon.5"; target: "elm.icon.6"; )
Domain: UI Framework / EFL;