[ctxpopup] fixed bug for N_SE-27154

	when width of text is bigger than that of bg, text has ellipsis state

diff --git a/themes/widgets/ctxpopup.edc b/themes/widgets/ctxpopup.edc
index 924eb68..6655f45 100644 (file)
--- a/themes/widgets/ctxpopup.edc
+++ b/themes/widgets/ctxpopup.edc
@@ -39,7 +39,7 @@
        }
        group {
                name: "elm/ctxpopup/layout/default";
-               max: CTXPOPUP_WIDTH_MAX_INC 802;
+               max: (CTXPOPUP_WIDTH_MAX_INC+CTXPOPUP_SHADOW_LEFT_PADDING+CTXPOPUP_SHADOW_RIGHT_PADDING) ((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";
@@ -665,7 +665,7 @@
 ///////////////////////////////////////////////////////////////////////////////
        group {
                name: "elm/ctxpopup/layout/more/default";
-               max: CTXPOPUP_MORE_WIDTH_INC 802;
+               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);
                parts {
                        part {
                                name:"top_padding";
@@ -1972,6 +1972,9 @@
 ///////////////////////////////////////////////////////////////////////////////
        group {
                name: "elm/ctxpopup/text_style_item/default";
+
+               data.item: "item_max_size" CTXPOPUP_ITEM_MAX_INC;
+
                parts {
                        part {
                                name: "event_blocker";
@@ -1996,14 +1999,14 @@
                                }
                                description {
                                        state: "clicked" 0.0;
+                                       inherit: "default" 0.0;
                                        color: CTXPOPUP_BG_PRESS_COLOR_INC;
-                                       visible: 1;
                                }
                                description {
                                        state: "clicked_separator" 0.0;
+                                       inherit: "default" 0.0;
                                        rel1 { relative: 0.0 1.0; to_y: "separator2"; }
                                        color: CTXPOPUP_BG_PRESS_COLOR_INC;
-                                       visible: 1;
                                }
                        }
                        part {
@@ -2095,6 +2098,7 @@
                                        state: "clicked" 0.0;
                                        inherit: "default" 0.0;
                                        color: CTXPOPUP_LIST_MAIN_TEXT_PRESS_COLOR_INC;
+                                       text.min: 0 0;
                                }
                                description {
                                        state: "disabled" 0.0;
@@ -2106,6 +2110,12 @@
                                        inherit: "compress" 0.0;
                                        color: CTXPOPUP_LIST_MAIN_TEXT_DIM_COLOR_INC;
                                }
+                               description {
+                                       state: "ellipsis" 0.0;
+                                       inherit: "default" 0.0;
+                                       min: CTXPOPUP_ITEM_MAX_INC CTXPOPUP_ITEM_HEIGHT_MIN_INC;
+                                       text.min: 0 0;
+                               }
                        }
                        part {
                                name: "right_padding";
@@ -2163,6 +2173,13 @@
                }
                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";
@@ -2829,6 +2846,9 @@
 ///////////////////////////////////////////////////////////////////////////////
        group {
                name: "elm/ctxpopup/icon_text_style_item/default";
+
+               data.item: "item_max_size" CTXPOPUP_ITEM_MAX_INC;
+
                parts {
                        part {
                                name: "event_blocker";
@@ -3001,6 +3021,7 @@
                                        state: "clicked" 0.0;
                                        inherit: "default" 0.0;
                                        color: CTXPOPUP_LIST_MAIN_TEXT_PRESS_COLOR_INC;
+                                       text.min: 0 0;
                                }
                                description {
                                        state: "disabled" 0.0;
@@ -3012,6 +3033,12 @@
                                        inherit: "compress" 0.0;
                                        color: CTXPOPUP_LIST_MAIN_TEXT_DIM_COLOR_INC;
                                }
+                               description {
+                                       state: "ellipsis" 0.0;
+                                       inherit: "default" 0.0;
+                                       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 0;
+                               }
                        }
                        part {
                                name: "text_right_padding";
@@ -3069,6 +3096,13 @@
                }
                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";
@@ -3236,7 +3270,6 @@
                                        rel1 {to:"frame_shadow_left_top_padding";}
                                        rel2 {to:"frame_shadow_right_bottom_padding";}
                                        min: CTXPOPUP_MORE_WIDTH_INC 0;
-                                       //max: CTXPOPUP_MORE_WIDTH_INC 806;
                                        image {
                                                normal: "00_popup_bubble_bg.png";
                                                border: CTXPOPUP_BUBBLE_BG_IMAGE_BORDER;