projects / profile / ivi / efl-theme-tizen.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: f4306e2)
[ctxpopup] According to Winset GUI v5.2, ctxpopup can be as wide as 720px
authorBora Hwang <bora1.hwang@samsung.com>
Fri, 24 May 2013 03:40:55 +0000 (12:40 +0900)
committerSungho Kwak <sungho1.kwak@samsung.com>
Wed, 5 Jun 2013 07:30:36 +0000 (16:30 +0900)
Also, changed horizontal and vertical scroller images

Change-Id: I157d47e542427ad60e3e478ce70137faaf3da45f

Conflicts:

themes/inc/tizen-hd-inc.edc
themes/widgets/ctxpopup.edc

themes/images/tizen-hd/Popup/00_popup_scroll_h.png [new file with mode: 0755] patch | blob
themes/images/tizen-hd/Popup/00_popup_scroll_v.png [moved from themes/images/tizen-hd/Popup/00_popup_scroll.png with 100% similarity, mode: 0755] patch | blob | history
themes/inc/tizen-hd-inc.edc patch | blob | history
themes/widgets/ctxpopup.edc patch | blob | history

diff --git a/themes/images/tizen-hd/Popup/00_popup_scroll_h.png b/themes/images/tizen-hd/Popup/00_popup_scroll_h.png
new file mode 100755 (executable)
index 0000000..27b45f9
Binary files /dev/null and b/themes/images/tizen-hd/Popup/00_popup_scroll_h.png differ
diff --git a/themes/inc/tizen-hd-inc.edc b/themes/inc/tizen-hd-inc.edc
index 7dec94b..3c289fb 100644 (file)
--- a/themes/inc/tizen-hd-inc.edc
+++ b/themes/inc/tizen-hd-inc.edc
@@ -96,8 +96,10 @@
 #define PROGRESSBAR_STATUS_TEXT_FONT_SIZE_INC 20
 
 #define CTXPOPUP_WIDTH_MIN_INC 386
-#define CTXPOPUP_WIDTH_MAX_INC 620
-#define CTXPOPUP_TEXT_MAX_INC 572
+#define CTXPOPUP_WIDTH_MAX_INC 700
+#define CTXPOPUP_TEXT_MAX_INC 660
+#define CTXPOPUP_ICON_TEXT_MAX_INC 603
+#define CTXPOPUP_MORE_TEXT_MAX_INC 603
 #define CTXPOPUP_BUBBLE_BG_IMAGE_BORDER 26 26 22 30
 #define CTXPOPUP_BUBBLE_BG_PRESSED_IMAGE_BORDER 8 8 8 8
 #define CTXPOPUP_SHADOW_LEFT_PADDING 10
@@ -107,7 +109,8 @@
 #define CTXPOPUP_CONTENT_PADDING 4
 #define CTXPOPUP_ARROW_PADDING 1
 #define CTXPOPUP_SCROLLER_PADDING 8
-#define CTXPOPUP_SCROLLER_MIN_SIZE_INC 9 18
+#define CTXPOPUP_SCROLLER_V_MIN_SIZE_INC 9 18
+#define CTXPOPUP_SCROLLER_H_MIN_SIZE_INC 18 9
 #define CTXPOPUP_FRAME_CORNER_ARROW_PADDING 22
 #define CTXPOPUP_MAIN_TEXT_COLOR_INC 255 255 255 255
 #define CTXPOPUP_MAIN_TEXT_DIM_COLOR_INC 255 255 255 178
@@ -141,7 +144,8 @@
 #define CTXPOPUP_TP_BG_IMAGE_BORDER 8 8 8 8
 #define CTXPOPUP_TP_ARROW_SIZE_INC 27 18
 #define CTXPOPUP_TP_HEIGHT_INC 102
-#define CTXPOPUP_MORE_WIDTH_INC 502
+#define CTXPOPUP_MORE_WIDTH_MIN_INC 502
+#define CTXPOPUP_MORE_WIDTH_MAX_INC 720
 #define CTXPOPUP_MORE_ITEM_PADDING_INC 16
 #define CTXPOPUP_MORE_ITEM_HEIGHT_MIN_INC 110
 #define CTXPOPUP_MORE_ITEM_HEIGHT_MAX_INC 130
@@ -150,7 +154,8 @@
 #define CTXPOPUP_MORE_ITEM_TEXT_SIZE_INC 40
 #define CTXPOPUP_MORE_SEPARATOR_PADDING_INC 20
 #define CTXPOPUP_MOVE_PAD_INC 40
-#define CTXPOPUP_TOOLBAR_SEGMENTEDCONTROL_WIDTH_INC 336
+#define CTXPOPUP_TOOLBAR_SEGMENTEDCONTROL_WIDTH_MIN_INC 336
+#define CTXPOPUP_TOOLBAR_SEGMENTEDCONTROL_WIDTH_MAX_INC 720
 #define CTXPOPUP_TOOLBAR_SEGMENTEDCONTROL_HEIGHT_MIN_INC 90
 #define CTXPOPUP_TOOLBAR_SEGMENTEDCONTROL_HEIGHT_MAX_INC 130
 
diff --git a/themes/widgets/ctxpopup.edc b/themes/widgets/ctxpopup.edc
index 9fad0a6..c952e0a 100644 (file)
--- a/themes/widgets/ctxpopup.edc
+++ b/themes/widgets/ctxpopup.edc
@@ -692,7 +692,7 @@
 ///////////////////////////////////////////////////////////////////////////////
        group {
                name: "elm/ctxpopup/layout/more/default";
-               max: CTXPOPUP_MORE_WIDTH_INC ((CTXPOPUP_ITEM_HEIGHT_MIN_INC*7)+CTXPOPUP_SHADOW_TOP_PADDING+CTXPOPUP_SHADOW_BOTTOM_PADDING+(CTXPOPUP_SEPARATOR_PXLINE_SIZE_INC*12)-CTXPOPUP_CONTENT_PADDING);
+               max: CTXPOPUP_MORE_WIDTH_MAX_INC ((CTXPOPUP_ITEM_HEIGHT_MIN_INC*7)+CTXPOPUP_SHADOW_TOP_PADDING+CTXPOPUP_SHADOW_BOTTOM_PADDING+(CTXPOPUP_SEPARATOR_PXLINE_SIZE_INC*12)-CTXPOPUP_CONTENT_PADDING);
                parts {
                        part {
                                name:"top_padding";
@@ -792,33 +792,28 @@
                                clip_to: "layout_clip";
                                description {
                                        state: "default" 0.0;
-                                       max: CTXPOPUP_MORE_WIDTH_INC 806;
                                        visible: 0;
                                }
                                description {
                                        state: "show_up" 0.0;
-                                       max: CTXPOPUP_MORE_WIDTH_INC 806;
                                        rel1 {to_x:"left_padding"; to_y:"top_padding"; relative: 1.0 1.0;}
                                        rel2 {to_x:"right_padding"; to_y:"top_padding"; relative: 0.0 1.0;}
                                        align: 0.5 0.0;
                                }
                                description {
                                        state: "show_down" 0.0;
-                                       max: CTXPOPUP_MORE_WIDTH_INC 806;
                                        rel1 {to_x:"left_padding"; to_y:"bottom_padding"; relative: 1.0 0.0;}
                                        rel2 {to_x:"right_padding"; to_y:"bottom_padding"; relative: 0.0 0.0;}
                                        align: 0.5 1.0;
                                }
                                description {
                                        state: "show_left" 0.0;
-                                       max: CTXPOPUP_MORE_WIDTH_INC 806;
                                        rel1 {to_x:"left_padding"; to_y:"top_padding"; relative: 1.0 1.0;}
                                        rel2 {to_x:"left_padding"; to_y:"bottom_padding"; relative: 1.0 0.0;}
                                        align: 0.0 0.5;
                                }
                                description {
                                        state: "show_right" 0.0;
-                                       max: CTXPOPUP_MORE_WIDTH_INC 806;
                                        rel1 {to_x:"right_padding"; to_y:"top_padding"; relative: 0.0 1.0;}
                                        rel2 {to_x:"right_padding"; to_y:"bottom_padding"; relative: 0.0 0.0;}
                                        align: 1.0 0.5;
@@ -1021,7 +1016,7 @@
     group {
         name: "elm/ctxpopup/layout/landscape/more/default";
         inherit: "elm/ctxpopup/layout/landscape/default";
-        max: CTXPOPUP_MORE_WIDTH_INC ((CTXPOPUP_ITEM_HEIGHT_MIN_INC*5)+CTXPOPUP_SHADOW_TOP_PADDING+CTXPOPUP_SHADOW_BOTTOM_PADDING+(CTXPOPUP_SEPARATOR_PXLINE_SIZE_INC*8)-CTXPOPUP_CONTENT_PADDING);
+        max: CTXPOPUP_MORE_WIDTH_MAX_INC ((CTXPOPUP_ITEM_HEIGHT_MIN_INC*5)+CTXPOPUP_SHADOW_TOP_PADDING+CTXPOPUP_SHADOW_BOTTOM_PADDING+(CTXPOPUP_SEPARATOR_PXLINE_SIZE_INC*8)-CTXPOPUP_CONTENT_PADDING);
     }
 ///////////////////////////////////////////////////////////////////////////////
        group {
@@ -1051,8 +1046,8 @@
                        }
                }
                images {
-                       image: "00_popup_scroll.png" COMP;
-                       image: "01_scroller.png" COMP;
+                       image: "00_popup_scroll_v.png" COMP;
+                       image: "00_popup_scroll_h.png" COMP;
                }
                parts {
                        part {
@@ -1147,7 +1142,7 @@
                                description {
                                        state: "default" 0.0;
                                        fixed: 1 1;
-                                       min: CTXPOPUP_SCROLLER_MIN_SIZE_INC;
+                                       min: CTXPOPUP_SCROLLER_V_MIN_SIZE_INC;
                                        rel1 {
                                                relative: 0.5  0.5;
                                                to: "sb_vbar";
@@ -1157,8 +1152,8 @@
                                                to: "sb_vbar";
                                        }
                                        image {
-                                               normal: "00_popup_scroll.png";
-                                               border: 0 0 5 5;
+                                               normal: "00_popup_scroll_v.png";
+                                               border: 0 0 8 8;
                                                border_scale: 1;
                                        }
                                }
@@ -1194,6 +1189,22 @@
                                }
                        }
                        part {
+                               name: "sb_hbar_padding";
+                               type: RECT;
+                               mouse_events: 0;
+                               scale: 1;
+                               description {
+                                       state: "default" 0.0;
+                                       fixed: 1 1;
+                                       min: 0 (CTXPOPUP_SCROLLER_PADDING-CTXPOPUP_CONTENT_PADDING);
+                                       max: 0 (CTXPOPUP_SCROLLER_PADDING-CTXPOPUP_CONTENT_PADDING);
+                                       visible: 0;
+                                       align: 0.0 1.0;
+                                       rel1 { to:"clipper"; relative: 0.0 1.0; }
+                                       rel2 { to:"clipper"; relative: 1.0 1.0; }
+                               }
+                       }
+                       part {
                                name: "sb_hbar";
                                type: RECT;
                                mouse_events: 0;
@@ -1203,8 +1214,8 @@
                                        fixed: 1 1;
                                        visible: 0;
                                        align: 0.0 1.0;
-                                       rel1 {to:"clipper"; relative: 0.0 1.0;}
-                                       rel2 {to:"clipper"; relative: 1.0 1.0;}
+                                       rel1 {to_x:"clipper"; to_y: "sb_hbar_padding"; relative: 0.0 0.0;}
+                                       rel2 {to_x:"clipper"; to_y: "sb_hbar_padding"; relative: 1.0 0.0;}
                                }
                        }
                        part {
@@ -1220,12 +1231,12 @@
                                description {
                                        state: "default" 0.0;
                                        fixed: 1 1;
-                                       min: 32 12;
+                                       min: CTXPOPUP_SCROLLER_H_MIN_SIZE_INC;
                                        rel1 {relative: 0.5  0.5; to: "sb_hbar";}
                                        rel2 {relative: 0.5  0.5; to: "sb_hbar";}
                                        image {
-                                               normal: "01_scroller.png";
-                                               border: 6 6 0 0;
+                                               normal: "00_popup_scroll_h.png";
+                                               border: 8 8 0 0;
                                                border_scale: 1;
                                        }
                                }
@@ -2547,14 +2558,7 @@ group {
                                signal: "elm,state,disabled";
                                source: "elm";
                                script {
-                                       new st[31];
-                                       new Float:vl;
-                                       get_state(PART:"elm.text", st, 30, vl);
-                                       if ((!strcmp(st, "ellipsis")) || (!strcmp(st, "ellipsis_disabled")))
-                                               set_state(PART:"elm.text", "ellipsis_disabled", 0.0);
-                                       else
-                                               set_state(PART:"elm.text", "disabled", 0.0);
-
+                                       set_state(PART:"elm.text", "disabled", 0.0);
                                        set_state(PART:"disclip", "disabled", 0.0);
                                }
                        }
@@ -2563,14 +2567,7 @@ group {
                                signal: "elm,state,enabled";
                                source: "elm";
                                script {
-                                       new st[31];
-                                       new Float:vl;
-                                       get_state(PART:"elm.text", st, 30, vl);
-                                       if ((!strcmp(st, "ellipsis")) || (!strcmp(st, "ellipsis_disabled")))
-                                               set_state(PART:"elm.text", "ellipsis", 0.0);
-                                       else
-                                               set_state(PART:"elm.text", "default", 0.0);
-
+                                       set_state(PART:"elm.text", "default", 0.0);
                                        set_state(PART:"disclip", "default", 0.0);
                                }
                        }
@@ -3076,6 +3073,11 @@ group {
                                        min: (CTXPOPUP_WIDTH_MAX_INC-CTXPOPUP_ITEM_TEXT_PADDING_INC-CTXPOPUP_ICON_WIDTH_INC-(CTXPOPUP_ITEM_ICON_PADDING_INC*2)) CTXPOPUP_ITEM_HEIGHT_MIN_INC;
                                        text.min: 0 1;
                                }
+                               description {
+                                       state: "ellipsis_disabled" 0.0;
+                                       inherit: "ellipsis" 0.0;
+                                       color: CTXPOPUP_LIST_MAIN_TEXT_DIM_COLOR_INC;
+                               }
                        }
                        part {
                                name: "text_right_padding";
@@ -3289,7 +3291,7 @@ group {
                                        state: "default" 0.0;
                                        rel1 {to:"frame_shadow_left_top_padding";}
                                        rel2 {to:"frame_shadow_right_bottom_padding";}
-                                       min: CTXPOPUP_MORE_WIDTH_INC 0;
+                                       min: CTXPOPUP_MORE_WIDTH_MIN_INC 0;
                                        image {
                                                normal: "00_popup_bubble_bg.png";
                                                border: CTXPOPUP_BUBBLE_BG_IMAGE_BORDER;
@@ -3567,8 +3569,8 @@ group {
                                description {
                                        state: "default" 0.0;
                                        visible: 0;
-                                       min: (CTXPOPUP_MORE_WIDTH_INC-CTXPOPUP_SHADOW_LEFT_PADDING-CTXPOPUP_SHADOW_RIGHT_PADDING-CTXPOPUP_CONTENT_PADDING*2) 1;
-                                       max: (CTXPOPUP_MORE_WIDTH_INC-CTXPOPUP_SHADOW_LEFT_PADDING-CTXPOPUP_SHADOW_RIGHT_PADDING-CTXPOPUP_CONTENT_PADDING*2) CTXPOPUP_MORE_ITEM_HEIGHT_MAX_INC;
+                                       min: (CTXPOPUP_MORE_WIDTH_MIN_INC-CTXPOPUP_SHADOW_LEFT_PADDING-CTXPOPUP_SHADOW_RIGHT_PADDING-CTXPOPUP_CONTENT_PADDING*2) 1;
+                                       max: (CTXPOPUP_MORE_WIDTH_MAX_INC-CTXPOPUP_SHADOW_LEFT_PADDING-CTXPOPUP_SHADOW_RIGHT_PADDING-CTXPOPUP_CONTENT_PADDING*2) CTXPOPUP_MORE_ITEM_HEIGHT_MAX_INC;
                                }
                                description {
                                        state: "clicked" 0.0;
@@ -3717,7 +3719,7 @@ group {
                                                font: "Tizen:style=Roman";
                                                size: CTXPOPUP_MORE_ITEM_TEXT_SIZE_INC;
                                                align: 0.0 0.5;
-                                               min: 0 1;
+                                               min: 1 1;
                                                text_class: "list_item";
                                        }
                                }
@@ -3731,6 +3733,17 @@ group {
                                        inherit: "default" 0.0;
                                        color: CTXPOPUP_LIST_MAIN_TEXT_DIM_COLOR_INC;
                                }
+                               description {
+                                       state: "ellipsis" 0.0;
+                                       inherit: "default" 0.0;
+                                       min: CTXPOPUP_MORE_TEXT_MAX_INC CTXPOPUP_MORE_ITEM_HEIGHT_MIN_INC;
+                                       text.min: 0 1;
+                               }
+                               description {
+                                       state: "ellipsis_disabled" 0.0;
+                                       inherit: "ellipsis" 0.0;
+                                       color: CTXPOPUP_LIST_MAIN_TEXT_DIM_COLOR_INC;
+                               }
                        }
                        part {
                                name: "text_right_padding";
@@ -3788,6 +3801,13 @@ group {
                }
                programs {
                        program {
+                               name: "text_ellipsis";
+                               signal: "elm,state,text,ellipsis";
+                               source: "elm";
+                               action: STATE_SET "ellipsis" 0.0;
+                               target: "elm.text";
+                       }
+                       program {
                                name: "item_unclick";
                                signal: "mouse,clicked,1";
                                source: "over1";
@@ -5202,6 +5222,8 @@ group {
                                        image: "00_more_popup_press.png" COMP;
                                }
 
+               data.item: "item_max_size" CTXPOPUP_TEXT_MAX_INC;
+
                parts {
                        part {
                                name: "event_blocker";
@@ -5220,8 +5242,8 @@ group {
                                description {
                                        state: "default" 0.0;
                                        visible: 0;
-                                       min: (CTXPOPUP_TOOLBAR_SEGMENTEDCONTROL_WIDTH_INC-CTXPOPUP_SHADOW_LEFT_PADDING-CTXPOPUP_SHADOW_RIGHT_PADDING-CTXPOPUP_CONTENT_PADDING*2) 1;
-                                       max: (CTXPOPUP_TOOLBAR_SEGMENTEDCONTROL_WIDTH_INC-CTXPOPUP_SHADOW_LEFT_PADDING-CTXPOPUP_SHADOW_RIGHT_PADDING-CTXPOPUP_CONTENT_PADDING*2) CTXPOPUP_TOOLBAR_SEGMENTEDCONTROL_HEIGHT_MAX_INC;
+                                       min: (CTXPOPUP_TOOLBAR_SEGMENTEDCONTROL_WIDTH_MIN_INC-CTXPOPUP_SHADOW_LEFT_PADDING-CTXPOPUP_SHADOW_RIGHT_PADDING-CTXPOPUP_CONTENT_PADDING*2) 1;
+                                       max: (CTXPOPUP_TOOLBAR_SEGMENTEDCONTROL_WIDTH_MAX_INC-CTXPOPUP_SHADOW_LEFT_PADDING-CTXPOPUP_SHADOW_RIGHT_PADDING-CTXPOPUP_CONTENT_PADDING*2) CTXPOPUP_TOOLBAR_SEGMENTEDCONTROL_HEIGHT_MAX_INC;
                                }
                                description {
                                        state: "clicked" 0.0;
@@ -5316,7 +5338,7 @@ group {
                                                font: "Tizen:style=Roman";
                                                size: CTXPOPUP_LIST_MAIN_TEXT_SIZE_INC;
                                                align: 0.5 0.5;
-                                               min: 0 1;
+                                               min: 1 1;
                                                text_class: "list_item";
                                        }
                                }
@@ -5324,12 +5346,24 @@ group {
                                        state: "clicked" 0.0;
                                        inherit: "default" 0.0;
                                        color: CTXPOPUP_LIST_MAIN_TEXT_PRESS_COLOR_INC;
+                                       text.min: 0 1;
                                }
                                description {
                                        state: "disabled" 0.0;
                                        inherit: "default" 0.0;
                                        color: CTXPOPUP_LIST_MAIN_TEXT_DIM_COLOR_INC;
                                }
+                               description {
+                                       state: "ellipsis" 0.0;
+                                       inherit: "default" 0.0;
+                                       min: CTXPOPUP_TEXT_MAX_INC CTXPOPUP_TOOLBAR_SEGMENTEDCONTROL_HEIGHT_MIN_INC;
+                                       text.min: 0 1;
+                               }
+                               description {
+                                       state: "ellipsis_disabled" 0.0;
+                                       inherit: "ellipsis" 0.0;
+                                       color: CTXPOPUP_LIST_MAIN_TEXT_DIM_COLOR_INC;
+                               }
                        }
                        part {
                                name: "right_padding";
@@ -5387,6 +5421,13 @@ group {
                }
                programs {
                        program {
+                               name: "text_ellipsis";
+                               signal: "elm,state,text,ellipsis";
+                               source: "elm";
+                               action: STATE_SET "ellipsis" 0.0;
+                               target: "elm.text";
+                       }
+                       program {
                                name: "item_unclick";
                                signal: "mouse,clicked,1";
                                source: "over1";
Domain: UI Framework / EFL;