Revert "[ctxpopup] more btn style shouldn't have arrow"
authorSungho Kwak <sungho1.kwak@samsung.com>
Wed, 5 Jun 2013 11:40:07 +0000 (20:40 +0900)
committerSungho Kwak <sungho1.kwak@samsung.com>
Wed, 12 Jun 2013 11:38:49 +0000 (20:38 +0900)
This reverts commit f07e2dfe0fed8677628c582171e641d6fa6e51f4.

Conflicts:

themes/widgets/ctxpopup.edc

Change-Id: I6cfdd4d2e58ce45a37301426ad4f2de1b9d55bec

themes/widgets/ctxpopup.edc

index 24210eb..d945c81 100644 (file)
@@ -1845,99 +1845,100 @@ group {
 }
 
 ///////////////////////////////////////////////////////////////////////////////
-group { name: "elm/ctxpopup/arrow/default";
-   images {
-      image: "00_popup_bubble_tail_left.png" COMP;
-      image: "00_popup_bubble_tail_right.png" COMP;
-      image: "00_popup_bubble_tail_top.png" COMP;
-      image: "00_popup_bubble_tail_bottom.png" COMP;
-   }
-   parts {
-      part {
-         name: "ctxpopup_arrow";
-         type: IMAGE;
-         scale: 1;
-         description {
-            state: "default" 0.0;
-            min: CTXPOPUP_ARROW_SIZE_INC;
-            max: CTXPOPUP_ARROW_SIZE_INC;
-            fixed: 1 1;
-            visible: 0;
-            align: 0.5 0.5;
-         }
-         description {
-            state: "left" 0.0;
-            min: CTXPOPUP_ARROW_SIZE_INC;
-            max: CTXPOPUP_ARROW_SIZE_INC;
-            fixed: 1 1;
-            align: 1.0 0.5;
-            image {
-               normal: "00_popup_bubble_tail_left.png";
-            }
-         }
-         description {
-            state: "right" 0.0;
-            min: CTXPOPUP_ARROW_SIZE_INC;
-            max: CTXPOPUP_ARROW_SIZE_INC;
-            fixed: 1 1;
-            align: 0.0 0.5;
-            image {
-               normal: "00_popup_bubble_tail_right.png";
-            }
-         }
-         description {
-            state: "top" 0.0;
-            min: CTXPOPUP_ARROW_SIZE_INC;
-            max: CTXPOPUP_ARROW_SIZE_INC;
-            fixed: 1 1;
-            align: 0.5 1.0;
-            image {
-               normal: "00_popup_bubble_tail_top.png";
-            }
-         }
-         description {
-            state: "bottom" 0.0;
-            min: CTXPOPUP_ARROW_SIZE_INC;
-            max: CTXPOPUP_ARROW_SIZE_INC;
-            fixed: 1 1;
-            align: 0.5 0.0;
-            image {
-               normal: "00_popup_bubble_tail_bottom.png";
-            }
-         }
-      }
-   }
-   programs {
-      program {
-         name: "enable_left_arrow";
-         signal: "elm,state,left";
-         source: "elm";
-         action: STATE_SET "left" 0.0;
-         target: "ctxpopup_arrow";
-      }
-      program {
-         name: "enable_right_arrow";
-         signal: "elm,state,right";
-         source: "elm";
-         action: STATE_SET "right" 0.0;
-         target: "ctxpopup_arrow";
-      }
-      program {
-         name: "enable_top_arrow";
-         signal: "elm,state,top";
-         source: "elm";
-         action: STATE_SET "top" 0.0;
-         target: "ctxpopup_arrow";
-      }
-      program {
-         name: "enable_bottom_arrow";
-         signal: "elm,state,bottom";
-         source: "elm";
-         action: STATE_SET "bottom" 0.0;
-         target: "ctxpopup_arrow";
-      }
-   }
-}
+       group { name: "elm/ctxpopup/arrow/default";
+               alias: "elm/ctxpopup/arrow/more/default";
+               images {
+                       image: "00_popup_bubble_tail_left.png" COMP;
+                       image: "00_popup_bubble_tail_right.png" COMP;
+                       image: "00_popup_bubble_tail_top.png" COMP;
+                       image: "00_popup_bubble_tail_bottom.png" COMP;
+               }
+               parts {
+                       part {
+                               name: "ctxpopup_arrow";
+                               type: IMAGE;
+                               scale: 1;
+                               description {
+                                       state: "default" 0.0;
+                                       min: CTXPOPUP_ARROW_SIZE_INC;
+                                       max: CTXPOPUP_ARROW_SIZE_INC;
+                                       fixed: 1 1;
+                                       visible: 0;
+                                       align: 0.5 0.5;
+                               }
+                               description {
+                                       state: "left" 0.0;
+                                       min: CTXPOPUP_ARROW_SIZE_INC;
+                                       max: CTXPOPUP_ARROW_SIZE_INC;
+                                       fixed: 1 1;
+                                       align: 1.0 0.5;
+                                       image {
+                                               normal: "00_popup_bubble_tail_left.png";
+                                       }
+                               }
+                               description {
+                                       state: "right" 0.0;
+                                       min: CTXPOPUP_ARROW_SIZE_INC;
+                                       max: CTXPOPUP_ARROW_SIZE_INC;
+                                       fixed: 1 1;
+                                       align: 0.0 0.5;
+                                       image {
+                                               normal: "00_popup_bubble_tail_right.png";
+                                       }
+                               }
+                               description {
+                                       state: "top" 0.0;
+                                       min: CTXPOPUP_ARROW_SIZE_INC;
+                                       max: CTXPOPUP_ARROW_SIZE_INC;
+                                       fixed: 1 1;
+                                       align: 0.5 1.0;
+                                       image {
+                                               normal: "00_popup_bubble_tail_top.png";
+                                       }
+                               }
+                               description {
+                                       state: "bottom" 0.0;
+                                       min: CTXPOPUP_ARROW_SIZE_INC;
+                                       max: CTXPOPUP_ARROW_SIZE_INC;
+                                       fixed: 1 1;
+                                       align: 0.5 0.0;
+                                       image {
+                                               normal: "00_popup_bubble_tail_bottom.png";
+                                       }
+                               }
+                       }
+               }
+               programs {
+                       program {
+                               name: "enable_left_arrow";
+                               signal: "elm,state,left";
+                               source: "elm";
+                               action: STATE_SET "left" 0.0;
+                               target: "ctxpopup_arrow";
+                       }
+                       program {
+                               name: "enable_right_arrow";
+                               signal: "elm,state,right";
+                               source: "elm";
+                               action: STATE_SET "right" 0.0;
+                               target: "ctxpopup_arrow";
+                       }
+                       program {
+                               name: "enable_top_arrow";
+                               signal: "elm,state,top";
+                               source: "elm";
+                               action: STATE_SET "top" 0.0;
+                               target: "ctxpopup_arrow";
+                       }
+                       program {
+                               name: "enable_bottom_arrow";
+                               signal: "elm,state,bottom";
+                               source: "elm";
+                               action: STATE_SET "bottom" 0.0;
+                               target: "ctxpopup_arrow";
+                       }
+               }
+       }
 ///////////////////////////////////////////////////////////////////////////////
 group {
    name: "elm/ctxpopup/text_style_item/default";
@@ -3154,139 +3155,313 @@ group {
 }
 
 ///////////////////////////////////////////////////////////////////////////////
-group {
-   name: "elm/ctxpopup/base/more/default";
-   images {
-      image: "00_popup_bubble_bg.png" COMP;
-   }
-   parts {
-      part {
-         name:"frame_shadow_left_top_padding";
-         type:RECT;
-         scale: 1;
-         mouse_events: 0;
-         description {
-            state: "default" 0.0;
-            min: CTXPOPUP_SHADOW_LEFT_PADDING CTXPOPUP_SHADOW_TOP_PADDING;
-            max: CTXPOPUP_SHADOW_LEFT_PADDING CTXPOPUP_SHADOW_TOP_PADDING;
-            rel2 { relative: 0 0; }
-            align: 0 0;
-            fixed: 1 1;
-            visible: 0;
-         }
-      }
-      part {
-         name:"frame_shadow_right_bottom_padding";
-         type:RECT;
-         scale: 1;
-         mouse_events: 0;
-         description {
-            state: "default" 0.0;
-            min: CTXPOPUP_SHADOW_RIGHT_PADDING CTXPOPUP_SHADOW_BOTTOM_PADDING;
-            max: CTXPOPUP_SHADOW_RIGHT_PADDING CTXPOPUP_SHADOW_BOTTOM_PADDING;
-            rel1{relative: 1 1;}
-            align: 1 1;
-            fixed: 1 1;
-            visible: 0;
-         }
-      }
-      part {
-         name: "frame_bg";
-         type: IMAGE;
-         scale: 1;
-         mouse_events: 0;
-         description {
-            state: "default" 0.0;
-            rel1 {to:"frame_shadow_left_top_padding";}
-            rel2 {to:"frame_shadow_right_bottom_padding";}
-            min: CTXPOPUP_MORE_WIDTH_MIN_INC 0;
-            image {
-               normal: "00_popup_bubble_bg.png";
-               border: CTXPOPUP_BUBBLE_BG_IMAGE_BORDER;
-               border_scale: 1;
-            }
-         }
-      }
-      part {
-         name: "ctxpopup_frame_left_top";
-         type: RECT;
-         scale: 1;
-         description {
-            state: "default" 0.0;
-            visible: 0;
-            align: 0 0;
-            fixed: 1 1;
-            min: CTXPOPUP_FRAME_CORNER_ARROW_PADDING CTXPOPUP_FRAME_CORNER_ARROW_PADDING;
-            max: CTXPOPUP_FRAME_CORNER_ARROW_PADDING CTXPOPUP_FRAME_CORNER_ARROW_PADDING;
-            rel1 {relative: 0 0; to: "content_left_top_padding";}
-         }
-      }
-      part {
-         name: "ctxpopup_frame_right_bottom";
-         type: RECT;
-         scale: 1;
-         description {
-            state: "default" 0.0;
-            visible: 0;
-            align: 1 1;
-            fixed: 1 1;
-            min: CTXPOPUP_FRAME_CORNER_ARROW_PADDING CTXPOPUP_FRAME_CORNER_ARROW_PADDING;
-            max: CTXPOPUP_FRAME_CORNER_ARROW_PADDING CTXPOPUP_FRAME_CORNER_ARROW_PADDING;
-            rel2 {relative: 1 1; to: "content_right_bottom_padding";}
-         }
-      }
-      part {
-         name:"content_left_top_padding";
-         type:RECT;
-         scale: 1;
-         mouse_events: 0;
-         description {
-            state: "default" 0.0;
-            min: CTXPOPUP_CONTENT_PADDING CTXPOPUP_CONTENT_PADDING;
-            max: CTXPOPUP_CONTENT_PADDING CTXPOPUP_CONTENT_PADDING;
-            rel1 {to:"frame_shadow_left_top_padding";  relative: 1.0 1.0;}
-            align: 0 0;
-            fixed: 1 1;
-            visible: 0;
-         }
-      }
-      part {
-         name:"content_right_bottom_padding";
-         type:RECT;
-         scale: 1;
-         mouse_events: 0;
-         description {
-            state: "default" 0.0;
-            min: CTXPOPUP_CONTENT_PADDING CTXPOPUP_CONTENT_PADDING;
-            max: CTXPOPUP_CONTENT_PADDING CTXPOPUP_CONTENT_PADDING;
-            rel2 {to:"frame_shadow_right_bottom_padding";  relative: 0.0 0.0;}
-            align: 1 1;
-            fixed: 1 1;
-            visible: 0;
-         }
-      }
-      part {
-         name: "elm.swallow.content";
-         type: SWALLOW;
-         description {
-            state: "default" 0.0;
-            align: 0 0;
-            rel1 {to:"content_left_top_padding";  relative: 1.0 1.0;}
-            rel2 {to:"content_right_bottom_padding";  relative: 0.0 0.0;}
-         }
-      }
-      part { name: "access.outline";
-         type: RECT;
-         repeat_events: 1;
-         description { state: "default" 0.0;
-            fixed: 1 1;
-            rel1.to: "frame_bg";
-            rel2.to: "frame_bg";
-            color: 0 0 0 0;
-         }
-      }
-   }
-}
+       group {
+               name: "elm/ctxpopup/base/more/default";
+               images {
+                       image: "00_popup_bubble_bg.png" COMP;
+               }
+               parts {
+                       part {
+                               name:"frame_shadow_left_top_padding";
+                               type:RECT;
+                               scale: 1;
+                               mouse_events: 0;
+                               description {
+                                       state: "default" 0.0;
+                                       min: CTXPOPUP_SHADOW_LEFT_PADDING CTXPOPUP_SHADOW_TOP_PADDING;
+                                       max: CTXPOPUP_SHADOW_LEFT_PADDING CTXPOPUP_SHADOW_TOP_PADDING;
+                                       rel2 { relative: 0 0; }
+                                       align: 0 0;
+                                       fixed: 1 1;
+                                       visible: 0;
+                               }
+                       }
+                       part {
+                               name:"frame_shadow_right_bottom_padding";
+                               type:RECT;
+                               scale: 1;
+                               mouse_events: 0;
+                               description {
+                                       state: "default" 0.0;
+                                       min: CTXPOPUP_SHADOW_RIGHT_PADDING CTXPOPUP_SHADOW_BOTTOM_PADDING;
+                                       max: CTXPOPUP_SHADOW_RIGHT_PADDING CTXPOPUP_SHADOW_BOTTOM_PADDING;
+                                       rel1{relative: 1 1;}
+                                       align: 1 1;
+                                       fixed: 1 1;
+                                       visible: 0;
+                               }
+                       }
+                       part {
+                               name: "frame_bg";
+                               type: IMAGE;
+                               scale: 1;
+                               mouse_events: 0;
+                               description {
+                                       state: "default" 0.0;
+                                       rel1 {to:"frame_shadow_left_top_padding";}
+                                       rel2 {to:"frame_shadow_right_bottom_padding";}
+                                       min: CTXPOPUP_MORE_WIDTH_MIN_INC 0;
+                                       image {
+                                               normal: "00_popup_bubble_bg.png";
+                                               border: CTXPOPUP_BUBBLE_BG_IMAGE_BORDER;
+                                               border_scale: 1;
+                                       }
+                               }
+                       }
+                       part { name: "arrow_area_left";
+                               type: RECT;
+                               mouse_events: 0;
+                               scale: 1;
+                               description { state: "default" 0.0;
+                                       visible: 0;
+                                       min: CTXPOPUP_ARROW_SIZE_INC;
+                                       fixed: 1 1;
+                                       align: 1 0.5;
+                                       rel1 {
+                                               relative: 1 1;
+                                               to_x:"arrow_left_top_padding";
+                                               to_y: "ctxpopup_frame_left_top";
+                                       }
+                                       rel2 {
+                                               relative: 1 0;
+                                               to_x:"arrow_left_top_padding";
+                                               to_y:"ctxpopup_frame_right_bottom";
+                                       }
+                               }
+                       }
+                       part { name: "arrow_area_right";
+                               type: RECT;
+                               mouse_events: 0;
+                               scale: 1;
+                               description { state: "default" 0.0;
+                                       visible: 0;
+                                       min: CTXPOPUP_ARROW_SIZE_INC;
+                                       fixed: 1 1;
+                                       align: 0 0.5;
+                                       rel1 {
+                                               relative: 0 1;
+                                               to_x:"arrow_right_bottom_padding";
+                                               to_y:"ctxpopup_frame_left_top";
+                                       }
+                                       rel2 {
+                                               relative: 0 0;
+                                               to_x:"arrow_right_bottom_padding";
+                                               to_y: "ctxpopup_frame_right_bottom";
+                                       }
+                               }
+                       }
+                       part { name: "arrow_area_up";
+                               type: RECT;
+                               mouse_events: 0;
+                               scale: 1;
+                               description { state: "default" 0.0;
+                                       visible: 0;
+                                       min: CTXPOPUP_ARROW_SIZE_INC;
+                                       fixed: 1 1;
+                                       align: 0.5 1;
+                                       rel1 {
+                                               relative: 1 1;
+                                               to_x: "ctxpopup_frame_left_top";
+                                               to_y: "arrow_left_top_padding";
+                                       }
+                                       rel2 {
+                                               relative: 0 1;
+                                               to_x:"ctxpopup_frame_right_bottom";
+                                               to_y: "arrow_left_top_padding";
+                                       }
+                               }
+                       }
+                       part { name: "arrow_area_down";
+                               type: RECT;
+                               mouse_events: 0;
+                               scale: 1;
+                               description { state: "default" 0.0;
+                                       visible: 0;
+                                       min: CTXPOPUP_ARROW_SIZE_INC;
+                                       fixed: 1 1;
+                                       align: 0.5 0;
+                                       rel1 {
+                                               relative: 1 0;
+                                               to_x:"ctxpopup_frame_left_top";
+                                               to_y:"arrow_right_bottom_padding";
+                                       }
+                                       rel2 {
+                                               relative: 0 0;
+                                               to_x: "ctxpopup_frame_right_bottom";
+                                               to_y:"arrow_right_bottom_padding";
+                                       }
+                               }
+                       }
+                       part { name: "elm.swallow.arrow_up";
+                               type: SWALLOW;
+                               mouse_events: 0;
+                               scale: 1;
+                               dragable {
+                                       x: 1 1 0;
+                                       y: 1 1 0;
+                                       confine: "arrow_area_up";
+                               }
+                               description {
+                                       state: "default" 0.0;
+                                       min: CTXPOPUP_ARROW_SIZE_INC;
+                                       fixed: 1 1;
+                                       visible: 1;
+                               }
+                       }
+                       part { name: "elm.swallow.arrow_down";
+                               type: SWALLOW;
+                               mouse_events: 0;
+                               scale: 1;
+                               dragable {
+                                       x: 1 1 0;
+                                       y: 1 1 0;
+                                       confine: "arrow_area_down";
+                               }
+                               description {
+                                       state: "default" 0.0;
+                                       min: CTXPOPUP_ARROW_SIZE_INC;
+                                       fixed: 1 1;
+                                       visible: 1;
+                               }
+                       }
+                       part { name: "elm.swallow.arrow_left";
+                               type: SWALLOW;
+                               mouse_events: 0;
+                               scale: 1;
+                               dragable {
+                                       x: 1 1 0;
+                                       y: 1 1 0;
+                                       confine: "arrow_area_left";
+                               }
+                               description {
+                                       state: "default" 0.0;
+                                       min: CTXPOPUP_ARROW_SIZE_INC;
+                                       fixed: 1 1;
+                                       visible: 1;
+                               }
+                       }
+                       part { name: "elm.swallow.arrow_right";
+                               type: SWALLOW;
+                               mouse_events: 0;
+                               scale: 1;
+                               dragable {
+                                       x: 1 1 0;
+                                       y: 1 1 0;
+                                       confine: "arrow_area_right";
+                               }
+                               description {
+                                       state: "default" 0.0;
+                                       min: CTXPOPUP_ARROW_SIZE_INC;
+                                       fixed: 1 1;
+                                       visible: 1;
+                               }
+                       }
+                       part {
+                               name: "ctxpopup_frame_left_top";
+                               type: RECT;
+                               scale: 1;
+                               description {
+                                       state: "default" 0.0;
+                                       visible: 0;
+                                       align: 0 0;
+                                       fixed: 1 1;
+                                       min: CTXPOPUP_FRAME_CORNER_ARROW_PADDING CTXPOPUP_FRAME_CORNER_ARROW_PADDING;
+                                       max: CTXPOPUP_FRAME_CORNER_ARROW_PADDING CTXPOPUP_FRAME_CORNER_ARROW_PADDING;
+                                       rel1 {relative: 0 0; to: "content_left_top_padding";}
+                               }
+                       }
+                       part {
+                               name: "ctxpopup_frame_right_bottom";
+                               type: RECT;
+                               scale: 1;
+                               description {
+                                       state: "default" 0.0;
+                                       visible: 0;
+                                       align: 1 1;
+                                       fixed: 1 1;
+                                       min: CTXPOPUP_FRAME_CORNER_ARROW_PADDING CTXPOPUP_FRAME_CORNER_ARROW_PADDING;
+                                       max: CTXPOPUP_FRAME_CORNER_ARROW_PADDING CTXPOPUP_FRAME_CORNER_ARROW_PADDING;
+                                       rel2 {relative: 1 1; to: "content_right_bottom_padding";}
+                               }
+                       }
+                       part {
+                               name:"content_left_top_padding";
+                               type:RECT;
+                               scale: 1;
+                               mouse_events: 0;
+                               description {
+                                       state: "default" 0.0;
+                                       min: CTXPOPUP_CONTENT_PADDING CTXPOPUP_CONTENT_PADDING;
+                                       max: CTXPOPUP_CONTENT_PADDING CTXPOPUP_CONTENT_PADDING;
+                                       rel1 {to:"frame_shadow_left_top_padding";  relative: 1.0 1.0;}
+                                       align: 0 0;
+                                       fixed: 1 1;
+                                       visible: 0;
+                               }
+                       }
+                       part {
+                               name:"content_right_bottom_padding";
+                               type:RECT;
+                               scale: 1;
+                               mouse_events: 0;
+                               description {
+                                       state: "default" 0.0;
+                                       min: CTXPOPUP_CONTENT_PADDING CTXPOPUP_CONTENT_PADDING;
+                                       max: CTXPOPUP_CONTENT_PADDING CTXPOPUP_CONTENT_PADDING;
+                                       rel2 {to:"frame_shadow_right_bottom_padding";  relative: 0.0 0.0;}
+                                       align: 1 1;
+                                       fixed: 1 1;
+                                       visible: 0;
+                               }
+                       }
+                       part {
+                               name: "arrow_left_top_padding";
+                               type: RECT;
+                               mouse_events: 0;
+                               description {
+                                       state: "default" 0.0;
+                                       min: CTXPOPUP_ARROW_PADDING CTXPOPUP_ARROW_PADDING;
+                                       max: CTXPOPUP_ARROW_PADDING CTXPOPUP_ARROW_PADDING;
+                                       rel1 {to:"frame_shadow_left_top_padding";  relative: 1.0 1.0;}
+                                       align: 0 0;
+                                       visible: 0;
+                               }
+                       }
+                       part {
+                               name: "arrow_right_bottom_padding";
+                               type: RECT;
+                               mouse_events: 0;
+                               description {
+                                       state: "default" 0.0;
+                                       min: CTXPOPUP_ARROW_PADDING CTXPOPUP_ARROW_PADDING;
+                                       max: CTXPOPUP_ARROW_PADDING CTXPOPUP_ARROW_PADDING;
+                                       rel2 {to:"frame_shadow_right_bottom_padding";  relative: 0.0 0.0;}
+                                       align: 1 1;
+                                       visible: 0;
+                               }
+                       }
+                       part {
+                               name: "elm.swallow.content";
+                               type: SWALLOW;
+                               description {
+                                       state: "default" 0.0;
+                                       align: 0 0;
+                                       rel1 {to:"content_left_top_padding";  relative: 1.0 1.0;}
+                                       rel2 {to:"content_right_bottom_padding";  relative: 0.0 0.0;}
+                               }
+                       }
+                       part { name: "access.outline";
+                               type: RECT;
+                               repeat_events: 1;
+                               description { state: "default" 0.0;
+                                       fixed: 1 1;
+                                       rel1.to: "frame_bg";
+                                       rel2.to: "frame_bg";
+                                       color: 0 0 0 0;
+                               }
+                       }
+               }
+       }
 ///////////////////////////////////////////////////////////////////////////////
 group {
    name: "elm/ctxpopup/icon_text_style_item/more/default";