[ctxpopup] fixed P130411-7458: fixed VI bug and add landscape mode

Change-Id: I08691247adbc72739430213d69980876095d376b

Conflicts:

	themes/widgets/ctxpopup.edc

diff --git a/themes/widgets/ctxpopup.edc b/themes/widgets/ctxpopup.edc
index cd3c772..2cfb9c6 100644 (file)
--- a/themes/widgets/ctxpopup.edc
+++ b/themes/widgets/ctxpopup.edc
@@ -1016,7 +1016,7 @@
     group {
         name: "elm/ctxpopup/layout/landscape/more/default";
         inherit: "elm/ctxpopup/layout/landscape/default";
-        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);
+        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);
     }
 ///////////////////////////////////////////////////////////////////////////////
        group {
@@ -2437,7 +2437,14 @@ group {
                                signal: "elm,state,disabled";
                                source: "elm";
                                script {
-                                       set_state(PART:"elm.text", "disabled", 0.0);
+                                       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:"disclip", "disabled", 0.0);
                                }
                        }
@@ -2446,7 +2453,14 @@ group {
                                signal: "elm,state,enabled";
                                source: "elm";
                                script {
-                                       set_state(PART:"elm.text", "default", 0.0);
+                                       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:"disclip", "default", 0.0);
                                }
                        }