[ctxpopup] fixed swallow content, integrated separator

Change-Id: I013fe0133fd78097f3f796db22d5e892eaceb229

diff --git a/themes/groups/ctxpopup.edc b/themes/groups/ctxpopup.edc
index a4860e1..02ee1d9 100644 (file)
--- a/themes/groups/ctxpopup.edc
+++ b/themes/groups/ctxpopup.edc
@@ -805,32 +805,8 @@
                                description {
                                        state: "default" 0.0;
                                        align: 0 0;
-                                       rel1 {to:"ctxpopup_frame_left_top";  relative: 1.0 0.0;}
-                                       rel2 {to:"ctxpopup_frame_right_bottom";  relative: 0.0 1.0;}
-                               }
-                               description {
-                                       state: "horizontal" 0.0;
-                                       align: 0 0;
-                                       rel1 {to:"ctxpopup_frame_left_top";  relative: 0.0 1.0;}
-                                       rel2 {to:"ctxpopup_frame_right_bottom";  relative: 1.0 0.0;}
-                               }
-                       }
-               }
-               programs {
-                       program {
-                               name: "vertical";
-                               signal: "elm,state,vertical";
-                               source: "elm";
-                               script {
-                                       set_state(PART:"elm.swallow.content", "default", 0.0);
-                               }
-                       }
-                       program {
-                               name: "horizontal";
-                               signal: "elm,state,horizontal";
-                               source: "elm";
-                               script {
-                                       set_state(PART:"elm.swallow.content", "horizontal", 0.0);
+                                       rel1 {to:"ctxpopup_frame_left_top";  relative: 0.5 0.5;}
+                                       rel2 {to:"ctxpopup_frame_right_bottom";  relative: 0.5 0.5;}
                                }
                        }
                }
@@ -965,44 +941,32 @@
                                }
                        }
                        part {
-                               name: "bottom_separator";
+                               name: "separator";
                                mouse_events: 0;
                                type: RECT;
                                scale: 1;
                                description {
                                        state: "default" 0.0;
                                        color: CTXPOPUP_SEPARATOR_COLOR;
-                                       align: 0.5 1;
-                                       min: 0 1;
-                                       max: 999999 1;
-                                       rel2 { offset: 0 0.5; }
-                               }
-                               description {
-                                       state: "horizontal" 0.0;
-                                       visible: 0;
-                               }
-                       }
-                       part {
-                               name: "right_separator";
-                               mouse_events: 0;
-                               type: RECT;
-                               scale: 1;
-                               description {
-                                       state: "default" 0.0;
-                                       color: CTXPOPUP_SEPARATOR_COLOR;
-                                       align: 1 0.5;
+                                       align: 0.5 0;
                                        min: 1 0;
                                        max: 1 999999;
-                                       rel2 { offset: 0.5 0; }
                                        visible: 0;
                                }
                                description {
                                        state: "horizontal" 0.0;
                                        color: CTXPOPUP_SEPARATOR_COLOR;
-                                       align: 1 0.5;
+                                       align: 0 0.5;
                                        min: 1 0;
                                        max: 1 999999;
-                                       rel2 { offset: 0.5 0; }
+                                       visible: 1;
+                               }
+                       description {
+                                       state: "vertical" 0.0;
+                                       color: CTXPOPUP_SEPARATOR_COLOR;
+                                       align: 0.5 0;
+                                       min: 0 1;
+                                       max: 999999 1;
                                        visible: 1;
                                }
                        }
@@ -1112,12 +1076,19 @@
                                target: "disclip";
                        }
                        program {
+                               name: "default";
+                               signal: "elm,state,default";
+                               source: "elm";
+                               script {
+                                       set_state(PART:"separator", "default", 0.0);
+                               }
+                       }
+                       program {
                                name: "vertical";
                                signal: "elm,state,vertical";
                                source: "elm";
                                script {
-                                       set_state(PART:"bottom_separator", "default", 0.0);
-                                       set_state(PART:"right_separator", "default", 0.0);
+                                       set_state(PART:"separator", "vertical", 0.0);
                                }
                        }
                        program {
@@ -1125,11 +1096,9 @@
                                signal: "elm,state,horizontal";
                                source: "elm";
                                script {
-                                       set_state(PART:"bottom_separator", "horizontal", 0.0);
-                                       set_state(PART:"right_separator", "horizontal", 0.0);
+                                       set_state(PART:"separator", "horizontal", 0.0);
                                }
                        }
-
                        program {
                                name: "item_click2";
                                signal: "mouse,down,1";
@@ -1194,17 +1163,33 @@
                                }
                        }
                        part {
-                               name: "right_separator";
+                               name: "separator";
                                mouse_events: 0;
                                type: RECT;
                                scale: 1;
                                description {
                                        state: "default" 0.0;
                                        color: CTXPOPUP_SEPARATOR_COLOR;
-                                       align: 1 0.5;
+                                       align: 0.5 0;
                                        min: 1 0;
                                        max: 1 999999;
-                                       rel2 { offset: 0 0.5; }
+                                       visible: 0;
+                               }
+                               description {
+                                       state: "horizontal" 0.0;
+                                       color: CTXPOPUP_SEPARATOR_COLOR;
+                                       align: 0 0.5;
+                                       min: 1 0;
+                                       max: 1 999999;
+                                       visible: 1;
+                               }
+                       description {
+                                       state: "vertical" 0.0;
+                                       color: CTXPOPUP_SEPARATOR_COLOR;
+                                       align: 0.5 0;
+                                       min: 0 1;
+                                       max: 999999 1;
+                                       visible: 1;
                                }
                        }
                        part {
@@ -1265,6 +1250,30 @@
                }
                programs {
                        program {
+                               name: "default";
+                               signal: "elm,state,default";
+                               source: "elm";
+                               script {
+                                       set_state(PART:"separator", "default", 0.0);
+                               }
+                       }
+                       program {
+                               name: "vertical";
+                               signal: "elm,state,vertical";
+                               source: "elm";
+                               script {
+                                       set_state(PART:"separator", "vertical", 0.0);
+                               }
+                       }
+                       program {
+                               name: "horizontal";
+                               signal: "elm,state,horizontal";
+                               source: "elm";
+                               script {
+                                       set_state(PART:"separator", "horizontal", 0.0);
+                               }
+                       }
+                       program {
                                name: "item_unclick";
                                signal: "mouse,up,1";
                                source: "over1";
@@ -1347,44 +1356,32 @@
                                }
                        }
                        part {
-                               name: "bottom_separator";
-                               mouse_events: 0;
-                               type: RECT;
-                               scale: 1;
-                               description {
-                                       state: "default" 0.0;
-                                       color: CTXPOPUP_SEPARATOR_COLOR;
-                                       align: 0.5 1;
-                                       min: 0 1;
-                                       max: 999999 1;
-                                       rel2 { offset: 0 0.5; }
-                               }
-                               description {
-                                       state: "horizontal" 0.0;
-                                       visible: 0;
-                               }
-                       }
-                       part {
-                               name: "right_separator";
+                               name: "separator";
                                mouse_events: 0;
                                type: RECT;
                                scale: 1;
                                description {
                                        state: "default" 0.0;
                                        color: CTXPOPUP_SEPARATOR_COLOR;
-                                       align: 1 0.5;
+                                       align: 0.5 0;
                                        min: 1 0;
                                        max: 1 999999;
-                                       rel2 { offset: 0.5 0; }
                                        visible: 0;
                                }
                                description {
                                        state: "horizontal" 0.0;
                                        color: CTXPOPUP_SEPARATOR_COLOR;
-                                       align: 1 0.5;
+                                       align: 0 0.5;
                                        min: 1 0;
                                        max: 1 999999;
-                                       rel2 { offset: 0.5 0; }
+                                       visible: 1;
+                               }
+                       description {
+                                       state: "vertical" 0.0;
+                                       color: CTXPOPUP_SEPARATOR_COLOR;
+                                       align: 0.5 0;
+                                       min: 0 1;
+                                       max: 999999 1;
                                        visible: 1;
                                }
                        }
@@ -1509,12 +1506,19 @@
                                target: "disclip";
                        }
                        program {
+                               name: "default";
+                               signal: "elm,state,default";
+                               source: "elm";
+                               script {
+                                       set_state(PART:"separator", "default", 0.0);
+                               }
+                       }
+                       program {
                                name: "vertical";
                                signal: "elm,state,vertical";
                                source: "elm";
                                script {
-                                       set_state(PART:"bottom_separator", "default", 0.0);
-                                       set_state(PART:"right_separator", "default", 0.0);
+                                       set_state(PART:"separator", "vertical", 0.0);
                                }
                        }
                        program {
@@ -1522,8 +1526,7 @@
                                signal: "elm,state,horizontal";
                                source: "elm";
                                script {
-                                       set_state(PART:"bottom_separator", "horizontal", 0.0);
-                                       set_state(PART:"right_separator", "horizontal", 0.0);
+                                       set_state(PART:"separator", "horizontal", 0.0);
                                }
                        }
                        program {