From 5cf76469318ef455b84ab6db1cb9d8a1e67e2e8a Mon Sep 17 00:00:00 2001
From: Bora Hwang <bora1.hwang@samsung.com>
Date: Fri, 14 Jun 2013 16:44:31 +0900
Subject: [PATCH] [ctxpopup] adjusted Winset dark GUI v0.4

1. added pressed image
2. either border or separator meets bg image
3. changed values

Change-Id: I41bd8e412d245c0d25710b2bd5895faa2d3cac1a

Conflicts:

	themes/widgets/ctxpopup.edc
---
 .../images/HD/dark/Popup/00_more_popup_press.png   | Bin 3029 -> 2961 bytes
 themes/inc/tizen-dark-inc.edc                      |  15 +-
 themes/inc/tizen-light-inc.edc                     |  11 +-
 themes/widgets/ctxpopup.edc                        | 455 ++++++++++++++++-----
 4 files changed, 375 insertions(+), 106 deletions(-)
 mode change 100644 => 100755 themes/images/HD/dark/Popup/00_more_popup_press.png

diff --git a/themes/images/HD/dark/Popup/00_more_popup_press.png b/themes/images/HD/dark/Popup/00_more_popup_press.png
old mode 100644
new mode 100755
index d29cb705f21bfe994a1d67b486ea1450b710d1da..7e0457709fde167c61fbf1e017b657ad205a7a98
GIT binary patch
delta 219
zcmV<103`p_7m*jRzY2c<yh%hsRCwC#)G<y1Q4oOPZ>PY<8*l_n6bnf>f?8}V2T)3m
z11F%Q@d{g*7z5^AVQ&BhR5p)}5ZT?5ub%felX=Bpypr`W#T)K$>$EKrmYAoiJV22{
zeSG4<W!892RaqB<@v4Wf29cu;MuCqO5xB>DV4}TA;IV_yF!EEj+PVoHxrY81I&{$4
z27WpSrN~#@)-tfjhu73E7J)rp@|V!$@}E;x?vGomF~SVr*qwR2%QG`PrK+sqZvbLG
VDa}ZV!5jbp002ovPDHLkV1mEIW$6F_

delta 288
zcmV+*0pI?S7u6TAzY2c=07*naRCwB~)G<l}K@^AaUq)E*7^cz$%n8znMMRGgP|zk#
z?huQJpkN^0Lct<f#1lxef{oxE6mi91Gm#}AXm-D9m_PHu%zJMtwcgkQHMFsdb*#qy
z4?N=*Lp(y-ZGw;!Bsj+e9c<(z;(9Y?6I^0#9)_Ic21g6>-w1y=z;*rPKFNztvE%=2
zqYsr@Z(PR%RxHOC8X-RHvJ&xZJD{aFt$=C?qH2g0D@qcSL_k)8=QYH(FUm`Zvs08&
zz*TH21sZY~FvXyNXpnZB(|Of87%d^Wi)Vj^Hp3n+F#CgG7H_eicAMGaf0W@ETR6iL
mK6CjS(wH@Hi1!$I_&osdb~PtAdNld~0000<MNUMnLSTZ_JAQNk

diff --git a/themes/inc/tizen-dark-inc.edc b/themes/inc/tizen-dark-inc.edc
index ef15ef3..86e6c3c 100755
--- a/themes/inc/tizen-dark-inc.edc
+++ b/themes/inc/tizen-dark-inc.edc
@@ -94,7 +94,9 @@
 #define CTXPOPUP_SHADOW_TOP_PADDING 14
 #define CTXPOPUP_SHADOW_BOTTOM_PADDING 14
 #define CTXPOPUP_CONTENT_PADDING_WIDTH 1
-#define CTXPOPUP_CONTENT_PADDING_HEIGHT 8
+#define CTXPOPUP_CONTENT_PADDING_HEIGHT 1
+#define CTXPOPUP_PRESS_PADDING 4
+#define CTXPOPUP_PRESS_PADDING2 3
 #define CTXPOPUP_ARROW_PADDING 1
 #define CTXPOPUP_SCROLLER_PADDING 8
 #define CTXPOPUP_SCROLLER_V_MIN_SIZE_INC 9 18
@@ -110,10 +112,10 @@
 #define CTXPOPUP_SEPARATOR_PADDING_INC 20
 #define CTXPOPUP_SEPARATOR_COLOR_INC 29 38 60 255
 #define CTXPOPUP_SEPARATOR2_COLOR_INC 98 102 117 255
-#define CTXPOPUP_HORIZONTAL_SEPARATOR_1_COLOR_INC 45 45 45 255
-#define CTXPOPUP_HORIZONTAL_SEPARATOR_2_COLOR_INC 91 91 91 255
-#define CTXPOPUP_HORIZONTAL_SEPARATOR_MIN_SIZE_INC 1 74
-#define CTXPOPUP_HORIZONTAL_SEPARATOR_MAX_SIZE_INC 1 74
+#define CTXPOPUP_HORIZONTAL_SEPARATOR_1_COLOR_INC 29 38 60 255
+#define CTXPOPUP_HORIZONTAL_SEPARATOR_2_COLOR_INC 98 102 117 255
+#define CTXPOPUP_HORIZONTAL_SEPARATOR_MIN_SIZE_INC 1 96
+#define CTXPOPUP_HORIZONTAL_SEPARATOR_MAX_SIZE_INC 1 96
 #define CTXPOPUP_ITEM_DISABLED_COLOR 0 0 0 0
 #define CTXPOPUP_LIST_MAIN_TEXT_SIZE_INC 40
 #define CTXPOPUP_LIST_MAIN_TEXT_MAX_SIZE_INC (CTXPOPUP_LIST_MAIN_TEXT_SIZE_INC * 2)
@@ -135,6 +137,7 @@
 #define CTXPOPUP_TP_HEIGHT_INC 102
 #define CTXPOPUP_MORE_WIDTH_MIN_INC 502
 #define CTXPOPUP_MORE_WIDTH_MAX_INC 720
+#define CTXPOPUP_MORE_WIDTH_LANDSCAPE_MAX_INC 1280
 #define CTXPOPUP_MORE_ITEM_PADDING_INC 16
 #define CTXPOPUP_MORE_ITEM_HEIGHT_MIN_INC 110
 #define CTXPOPUP_MORE_ITEM_HEIGHT_MAX_INC 130
@@ -143,7 +146,7 @@
 #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_MIN_INC 336
+#define CTXPOPUP_TOOLBAR_SEGMENTEDCONTROL_WIDTH_MIN_INC 334
 #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/inc/tizen-light-inc.edc b/themes/inc/tizen-light-inc.edc
index 9376611..65c8cfb 100755
--- a/themes/inc/tizen-light-inc.edc
+++ b/themes/inc/tizen-light-inc.edc
@@ -121,7 +121,9 @@
 #define CTXPOPUP_SHADOW_TOP_PADDING 14
 #define CTXPOPUP_SHADOW_BOTTOM_PADDING 14
 #define CTXPOPUP_CONTENT_PADDING_WIDTH 1
-#define CTXPOPUP_CONTENT_PADDING_HEIGHT 8
+#define CTXPOPUP_CONTENT_PADDING_HEIGHT 1
+#define CTXPOPUP_PRESS_PADDING 4
+#define CTXPOPUP_PRESS_PADDING2 3
 #define CTXPOPUP_ARROW_PADDING 1
 #define CTXPOPUP_SCROLLER_PADDING 8
 #define CTXPOPUP_SCROLLER_V_MIN_SIZE_INC 9 18
@@ -139,8 +141,8 @@
 #define CTXPOPUP_SEPARATOR2_COLOR_INC 98 102 117 255
 #define CTXPOPUP_HORIZONTAL_SEPARATOR_1_COLOR_INC 29 38 60 255
 #define CTXPOPUP_HORIZONTAL_SEPARATOR_2_COLOR_INC 98 102 117 255
-#define CTXPOPUP_HORIZONTAL_SEPARATOR_MIN_SIZE_INC 1 74
-#define CTXPOPUP_HORIZONTAL_SEPARATOR_MAX_SIZE_INC 1 74
+#define CTXPOPUP_HORIZONTAL_SEPARATOR_MIN_SIZE_INC 1 96
+#define CTXPOPUP_HORIZONTAL_SEPARATOR_MAX_SIZE_INC 1 96
 #define CTXPOPUP_ITEM_DISABLED_COLOR 0 0 0 0
 #define CTXPOPUP_LIST_MAIN_TEXT_SIZE_INC 40
 #define CTXPOPUP_LIST_MAIN_TEXT_MAX_SIZE_INC (CTXPOPUP_LIST_MAIN_TEXT_SIZE_INC * 2)
@@ -162,6 +164,7 @@
 #define CTXPOPUP_TP_HEIGHT_INC 102
 #define CTXPOPUP_MORE_WIDTH_MIN_INC 502
 #define CTXPOPUP_MORE_WIDTH_MAX_INC 720
+#define CTXPOPUP_MORE_WIDTH_LANDSCAPE_MAX_INC 1280
 #define CTXPOPUP_MORE_ITEM_PADDING_INC 16
 #define CTXPOPUP_MORE_ITEM_HEIGHT_MIN_INC 110
 #define CTXPOPUP_MORE_ITEM_HEIGHT_MAX_INC 130
@@ -170,7 +173,7 @@
 #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_MIN_INC 336
+#define CTXPOPUP_TOOLBAR_SEGMENTEDCONTROL_WIDTH_MIN_INC 334
 #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 6e32e3e..d37e568 100644
--- a/themes/widgets/ctxpopup.edc
+++ b/themes/widgets/ctxpopup.edc
@@ -1022,7 +1022,7 @@ group {
 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_SEPARATOR_PXLINE_SIZE_INC*8));
+   max: CTXPOPUP_MORE_WIDTH_LANDSCAPE_MAX_INC ((CTXPOPUP_ITEM_HEIGHT_MIN_INC*5)+CTXPOPUP_SHADOW_TOP_PADDING+(CTXPOPUP_SEPARATOR_PXLINE_SIZE_INC*8));
 }
 ///////////////////////////////////////////////////////////////////////////////
 group {
@@ -1754,7 +1754,7 @@ group {
             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";}
+            rel1 {relative: 1 1; to: "frame_shadow_left_top_padding";}
          }
       }
       part {
@@ -1768,7 +1768,7 @@ group {
             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";}
+            rel2 {relative: 0 0; to: "frame_shadow_right_bottom_padding";}
          }
       }
       part {
@@ -1952,6 +1952,10 @@ group {
 group {
    name: "elm/ctxpopup/text_style_item/default";
 
+   images {
+      image: "00_more_popup_press.png" COMP;
+   }
+
    data.item: "item_max_size" CTXPOPUP_TEXT_MAX_INC;
 
    parts {
@@ -1967,7 +1971,7 @@ group {
       part {
          name: "bg";
          mouse_events: 0;
-         type: RECT;
+         type: IMAGE;
          scale: 1;
          description {
             state: "default" 0.0;
@@ -1977,16 +1981,67 @@ group {
          }
          description {
             state: "clicked" 0.0;
-            inherit: "default" 0.0;
-            color: CTXPOPUP_BG_PRESS_COLOR_INC;
+            rel1 {to_x: "bg_press_left_padding"; to_y: "bg_press_top_padding"; relative: 1.0 1.0;}
+            rel2 {to_x: "bg_press_right_padding"; to_y: "bg_press_bottom_padding"; relative: 0.0 0.0;}
             visible: 1;
+            image {
+               normal: "00_more_popup_press.png";
+               border: CTXPOPUP_BUBBLE_BG_PRESSED_IMAGE_BORDER;
+               border_scale: 1;
+            }
          }
+      }
+      part {
+         name: "bg_press_left_padding";
+         mouse_events: 0;
+         type: RECT;
+         scale: 1;
          description {
-            state: "clicked_separator" 0.0;
-            inherit: "default" 0.0;
-            visible: 1;
-            rel1 { relative: 0.0 1.0; to_y: "separator2"; }
-            color: CTXPOPUP_BG_PRESS_COLOR_INC;
+            state: "default" 0.0;
+            visible: 0;
+            min: CTXPOPUP_PRESS_PADDING CTXPOPUP_ITEM_HEIGHT_MIN_INC;
+            max: CTXPOPUP_PRESS_PADDING CTXPOPUP_ITEM_HEIGHT_MAX_INC;
+            align: 0 0.5;
+         }
+      }
+      part {
+         name: "bg_press_right_padding";
+         mouse_events: 0;
+         type: RECT;
+         scale: 1;
+         description {
+            state: "default" 0.0;
+            visible: 0;
+            min: CTXPOPUP_PRESS_PADDING CTXPOPUP_ITEM_HEIGHT_MIN_INC;
+            max: CTXPOPUP_PRESS_PADDING CTXPOPUP_ITEM_HEIGHT_MAX_INC;
+            align: 1 0.5;
+         }
+      }
+      part {
+         name: "bg_press_top_padding";
+         mouse_events: 0;
+         type: RECT;
+         scale: 1;
+         description {
+            state: "default" 0.0;
+            visible: 0;
+            min: (CTXPOPUP_WIDTH_MIN_INC-CTXPOPUP_CONTENT_PADDING_WIDTH*2) CTXPOPUP_PRESS_PADDING2;
+            max: (CTXPOPUP_WIDTH_MAX_INC-CTXPOPUP_CONTENT_PADDING_WIDTH*2) CTXPOPUP_PRESS_PADDING2;
+            rel1 {to: "separator2"; relative: 0.0 1.0;}
+            align: 0.5 0;
+         }
+      }
+      part {
+         name: "bg_press_bottom_padding";
+         mouse_events: 0;
+         type: RECT;
+         scale: 1;
+         description {
+            state: "default" 0.0;
+            visible: 0;
+            min: (CTXPOPUP_WIDTH_MIN_INC-CTXPOPUP_CONTENT_PADDING_WIDTH*2) CTXPOPUP_PRESS_PADDING2;
+            max: (CTXPOPUP_WIDTH_MAX_INC-CTXPOPUP_CONTENT_PADDING_WIDTH*2) CTXPOPUP_PRESS_PADDING2;
+            align: 0.5 1;
          }
       }
       part {
@@ -2219,14 +2274,7 @@ group {
          source: "over2";
          script {
             set_state(PART:"elm.text", "clicked", 0.0);
-
-            new st[31];
-            new Float:vl;
-            get_state(PART:"separator2", st, 30, vl);
-            if (!strcmp(st, "default"))
-              set_state(PART:"bg", "clicked", 0.0);
-            else
-              set_state(PART:"bg", "clicked_separator", 0.0);
+            set_state(PART:"bg", "clicked", 0.0);
          }
       }
       program {
@@ -2285,21 +2333,66 @@ group {
          description {
             state: "clicked" 0.0;
             visible: 1;
+            rel1 {to_x: "bg_press_left_padding"; to_y: "bg_press_top_padding"; relative: 1.0 1.0;}
+            rel2 {to_x: "bg_press_right_padding"; to_y: "bg_press_bottom_padding"; relative: 0.0 0.0;}
             image {
                normal: "00_more_popup_press.png";
                border: CTXPOPUP_BUBBLE_BG_PRESSED_IMAGE_BORDER;
                border_scale: 1;
             }
          }
+      }
+      part {
+         name: "bg_press_left_padding";
+         mouse_events: 0;
+         type: RECT;
+         scale: 1;
          description {
-            state: "clicked_separator" 0.0;
-            rel1 { relative: 1.0 0.0; to_x: "separator2"; }
-            visible: 1;
-            image {
-               normal: "00_more_popup_press.png";
-               border: CTXPOPUP_BUBBLE_BG_PRESSED_IMAGE_BORDER;
-               border_scale: 1;
-            }
+            state: "default" 0.0;
+            visible: 0;
+            min: CTXPOPUP_PRESS_PADDING2 (CTXPOPUP_ITEM_HORIZONTAL_HEIGHT_INC-CTXPOPUP_CONTENT_PADDING_HEIGHT*2);
+            max: CTXPOPUP_PRESS_PADDING2 (CTXPOPUP_ITEM_HORIZONTAL_HEIGHT_INC-CTXPOPUP_CONTENT_PADDING_HEIGHT*2);
+            rel1 {to: "separator2"; relative: 1.0 0.0;}
+            align: 0 0.5;
+         }
+      }
+      part {
+         name: "bg_press_right_padding";
+         mouse_events: 0;
+         type: RECT;
+         scale: 1;
+         description {
+            state: "default" 0.0;
+            visible: 0;
+            min: CTXPOPUP_PRESS_PADDING2 (CTXPOPUP_ITEM_HORIZONTAL_HEIGHT_INC-CTXPOPUP_CONTENT_PADDING_HEIGHT*2);
+            max: CTXPOPUP_PRESS_PADDING2 (CTXPOPUP_ITEM_HORIZONTAL_HEIGHT_INC-CTXPOPUP_CONTENT_PADDING_HEIGHT*2);
+            align: 1 0.5;
+         }
+      }
+      part {
+         name: "bg_press_top_padding";
+         mouse_events: 0;
+         type: RECT;
+         scale: 1;
+         description {
+            state: "default" 0.0;
+            visible: 0;
+            min: CTXPOPUP_ICON_ITEM_HORIZONTAL_WIDTH_INC CTXPOPUP_PRESS_PADDING;
+            max: CTXPOPUP_ICON_ITEM_HORIZONTAL_WIDTH_INC CTXPOPUP_PRESS_PADDING;
+            align: 0.5 0;
+         }
+      }
+      part {
+         name: "bg_press_bottom_padding";
+         mouse_events: 0;
+         type: RECT;
+         scale: 1;
+         description {
+            state: "default" 0.0;
+            visible: 0;
+            min: CTXPOPUP_ICON_ITEM_HORIZONTAL_WIDTH_INC CTXPOPUP_PRESS_PADDING;
+            max: CTXPOPUP_ICON_ITEM_HORIZONTAL_WIDTH_INC CTXPOPUP_PRESS_PADDING;
+            align: 0.5 1;
          }
       }
       part {
@@ -2497,14 +2590,7 @@ group {
          source: "over2";
          script {
             set_state(PART:"elm.text", "clicked", 0.0);
-
-            new st[31];
-            new Float:vl;
-            get_state(PART:"separator2", st, 30, vl);
-            if (!strcmp(st, "default"))
-              set_state(PART:"bg", "clicked", 0.0);
-            else
-              set_state(PART:"bg", "clicked_separator", 0.0);
+            set_state(PART:"bg", "clicked", 0.0);
          }
       }
       program {
@@ -2564,21 +2650,66 @@ group {
          description {
             state: "clicked" 0.0;
             visible: 1;
+            rel1 {to_x: "bg_press_left_padding"; to_y: "bg_press_top_padding"; relative: 1.0 1.0;}
+            rel2 {to_x: "bg_press_right_padding"; to_y: "bg_press_bottom_padding"; relative: 0.0 0.0;}
             image {
                normal: "00_more_popup_press.png";
                border: CTXPOPUP_BUBBLE_BG_PRESSED_IMAGE_BORDER;
                border_scale: 1;
             }
          }
+      }
+      part {
+         name: "bg_press_left_padding";
+         mouse_events: 0;
+         type: RECT;
+         scale: 1;
          description {
-            state: "clicked_separator" 0.0;
-            rel1 { relative: 1.0 0.0; to_x: "separator2"; }
-            visible: 1;
-            image {
-               normal: "00_more_popup_press.png";
-               border: CTXPOPUP_BUBBLE_BG_PRESSED_IMAGE_BORDER;
-               border_scale: 1;
-            }
+            state: "default" 0.0;
+            visible: 0;
+            min: CTXPOPUP_PRESS_PADDING2 (CTXPOPUP_ITEM_HORIZONTAL_HEIGHT_INC-CTXPOPUP_CONTENT_PADDING_HEIGHT*2);
+            max: CTXPOPUP_PRESS_PADDING2 (CTXPOPUP_ITEM_HORIZONTAL_HEIGHT_INC-CTXPOPUP_CONTENT_PADDING_HEIGHT*2);
+            rel1 {to: "separator2"; relative: 1.0 0.0;}
+            align: 0 0.5;
+         }
+      }
+      part {
+         name: "bg_press_right_padding";
+         mouse_events: 0;
+         type: RECT;
+         scale: 1;
+         description {
+            state: "default" 0.0;
+            visible: 0;
+            min: CTXPOPUP_PRESS_PADDING2 (CTXPOPUP_ITEM_HORIZONTAL_HEIGHT_INC-CTXPOPUP_CONTENT_PADDING_HEIGHT*2);
+            max: CTXPOPUP_PRESS_PADDING2 (CTXPOPUP_ITEM_HORIZONTAL_HEIGHT_INC-CTXPOPUP_CONTENT_PADDING_HEIGHT*2);
+            align: 1 0.5;
+         }
+      }
+      part {
+         name: "bg_press_top_padding";
+         mouse_events: 0;
+         type: RECT;
+         scale: 1;
+         description {
+            state: "default" 0.0;
+            visible: 0;
+            min: CTXPOPUP_ICON_ITEM_HORIZONTAL_WIDTH_INC CTXPOPUP_PRESS_PADDING;
+            max: CTXPOPUP_ICON_ITEM_HORIZONTAL_WIDTH_INC CTXPOPUP_PRESS_PADDING;
+            align: 0.5 0;
+         }
+      }
+      part {
+         name: "bg_press_bottom_padding";
+         mouse_events: 0;
+         type: RECT;
+         scale: 1;
+         description {
+            state: "default" 0.0;
+            visible: 0;
+            min: CTXPOPUP_ICON_ITEM_HORIZONTAL_WIDTH_INC CTXPOPUP_PRESS_PADDING;
+            max: CTXPOPUP_ICON_ITEM_HORIZONTAL_WIDTH_INC CTXPOPUP_PRESS_PADDING;
+            align: 0.5 1;
          }
       }
       part {
@@ -2764,13 +2895,7 @@ group {
          signal: "mouse,down,1";
          source: "over2";
          script {
-            new st[31];
-            new Float:vl;
-            get_state(PART:"separator2", st, 30, vl);
-            if (!strcmp(st, "default"))
-              set_state(PART:"bg", "clicked", 0.0);
-            else
-              set_state(PART:"bg", "clicked_separator", 0.0);
+            set_state(PART:"bg", "clicked", 0.0);
          }
       }
       program {
@@ -2802,6 +2927,10 @@ group {
 group {
    name: "elm/ctxpopup/icon_text_style_item/default";
 
+   images {
+      image: "00_more_popup_press.png" COMP;
+   }
+
    data.item: "item_max_size" CTXPOPUP_ICON_TEXT_MAX_INC;
 
    parts {
@@ -2817,7 +2946,7 @@ group {
       part {
          name: "bg";
          mouse_events: 0;
-         type: RECT;
+         type: IMAGE;
          description {
             state: "default" 0.0;
             visible: 0;
@@ -2826,14 +2955,67 @@ group {
          }
          description {
             state: "clicked" 0.0;
-            color: CTXPOPUP_BG_PRESS_COLOR_INC;
+            rel1 {to_x: "bg_press_left_padding"; to_y: "bg_press_top_padding"; relative: 1.0 1.0;}
+            rel2 {to_x: "bg_press_right_padding"; to_y: "bg_press_bottom_padding"; relative: 0.0 0.0;}
             visible: 1;
+            image {
+               normal: "00_more_popup_press.png";
+               border: CTXPOPUP_BUBBLE_BG_PRESSED_IMAGE_BORDER;
+               border_scale: 1;
+            }
          }
+      }
+      part {
+         name: "bg_press_left_padding";
+         mouse_events: 0;
+         type: RECT;
+         scale: 1;
          description {
-            state: "clicked_separator" 0.0;
-            rel1 { relative: 0.0 1.0; to_y: "separator2"; }
-            color: CTXPOPUP_BG_PRESS_COLOR_INC;
-            visible: 1;
+            state: "default" 0.0;
+            visible: 0;
+            min: CTXPOPUP_PRESS_PADDING CTXPOPUP_ITEM_HEIGHT_MIN_INC;
+            max: CTXPOPUP_PRESS_PADDING CTXPOPUP_ITEM_HEIGHT_MAX_INC;
+            align: 0 0.5;
+         }
+      }
+      part {
+         name: "bg_press_right_padding";
+         mouse_events: 0;
+         type: RECT;
+         scale: 1;
+         description {
+            state: "default" 0.0;
+            visible: 0;
+            min: CTXPOPUP_PRESS_PADDING CTXPOPUP_ITEM_HEIGHT_MIN_INC;
+            max: CTXPOPUP_PRESS_PADDING CTXPOPUP_ITEM_HEIGHT_MAX_INC;
+            align: 1 0.5;
+         }
+      }
+      part {
+         name: "bg_press_top_padding";
+         mouse_events: 0;
+         type: RECT;
+         scale: 1;
+         description {
+            state: "default" 0.0;
+            visible: 0;
+            min: (CTXPOPUP_WIDTH_MIN_INC-CTXPOPUP_CONTENT_PADDING_WIDTH*2) CTXPOPUP_PRESS_PADDING2;
+            max: (CTXPOPUP_WIDTH_MAX_INC-CTXPOPUP_CONTENT_PADDING_WIDTH*2) CTXPOPUP_PRESS_PADDING2;
+            rel1 {to: "separator2"; relative: 0.0 1.0;}
+            align: 0.5 0;
+         }
+      }
+      part {
+         name: "bg_press_bottom_padding";
+         mouse_events: 0;
+         type: RECT;
+         scale: 1;
+         description {
+            state: "default" 0.0;
+            visible: 0;
+            min: (CTXPOPUP_WIDTH_MIN_INC-CTXPOPUP_CONTENT_PADDING_WIDTH*2) CTXPOPUP_PRESS_PADDING2;
+            max: (CTXPOPUP_WIDTH_MAX_INC-CTXPOPUP_CONTENT_PADDING_WIDTH*2) CTXPOPUP_PRESS_PADDING2;
+            align: 0.5 1;
          }
       }
       part {
@@ -3109,14 +3291,7 @@ group {
          source: "over2";
          script {
             set_state(PART:"elm.text", "clicked", 0.0);
-
-            new st[31];
-            new Float:vl;
-            get_state(PART:"separator2", st, 30, vl);
-            if (!strcmp(st, "default"))
-              set_state(PART:"bg", "clicked", 0.0);
-            else
-              set_state(PART:"bg", "clicked_separator", 0.0);
+            set_state(PART:"bg", "clicked", 0.0);
          }
       }
       program {
@@ -3255,6 +3430,10 @@ group {
 group {
    name: "elm/ctxpopup/icon_text_style_item/more/default";
 
+   images {
+      image: "00_more_popup_press.png" COMP;
+   }
+
    data.item: "item_max_size" CTXPOPUP_MORE_TEXT_MAX_INC;
 
    parts {
@@ -3270,7 +3449,7 @@ group {
       part {
          name: "bg";
          mouse_events: 0;
-         type: RECT;
+         type: IMAGE;
          scale: 1;
          description {
             state: "default" 0.0;
@@ -3280,14 +3459,67 @@ group {
          }
          description {
             state: "clicked" 0.0;
-            color: CTXPOPUP_BG_PRESS_COLOR_INC;
+            rel1 {to_x: "bg_press_left_padding"; to_y: "bg_press_top_padding"; relative: 1.0 1.0;}
+            rel2 {to_x: "bg_press_right_padding"; to_y: "bg_press_bottom_padding"; relative: 0.0 0.0;}
             visible: 1;
+            image {
+               normal: "00_more_popup_press.png";
+               border: CTXPOPUP_BUBBLE_BG_PRESSED_IMAGE_BORDER;
+               border_scale: 1;
+            }
          }
+      }
+      part {
+         name: "bg_press_left_padding";
+         mouse_events: 0;
+         type: RECT;
+         scale: 1;
          description {
-            state: "clicked_separator" 0.0;
-            rel1 { relative: 0.0 1.0; to_y: "separator2"; }
-            color: CTXPOPUP_BG_PRESS_COLOR_INC;
-            visible: 1;
+            state: "default" 0.0;
+            visible: 0;
+            min: CTXPOPUP_PRESS_PADDING CTXPOPUP_ITEM_HEIGHT_MIN_INC;
+            max: CTXPOPUP_PRESS_PADDING CTXPOPUP_ITEM_HEIGHT_MAX_INC;
+            align: 0 0.5;
+         }
+      }
+      part {
+         name: "bg_press_right_padding";
+         mouse_events: 0;
+         type: RECT;
+         scale: 1;
+         description {
+            state: "default" 0.0;
+            visible: 0;
+            min: CTXPOPUP_PRESS_PADDING CTXPOPUP_ITEM_HEIGHT_MIN_INC;
+            max: CTXPOPUP_PRESS_PADDING CTXPOPUP_ITEM_HEIGHT_MAX_INC;
+            align: 1 0.5;
+         }
+      }
+      part {
+         name: "bg_press_top_padding";
+         mouse_events: 0;
+         type: RECT;
+         scale: 1;
+         description {
+            state: "default" 0.0;
+            visible: 0;
+            min: (CTXPOPUP_WIDTH_MIN_INC-CTXPOPUP_CONTENT_PADDING_WIDTH*2) CTXPOPUP_PRESS_PADDING2;
+            max: (CTXPOPUP_WIDTH_MAX_INC-CTXPOPUP_CONTENT_PADDING_WIDTH*2) CTXPOPUP_PRESS_PADDING2;
+            rel1 {to: "separator2"; relative: 0.0 1.0;}
+            align: 0.5 0;
+         }
+      }
+      part {
+         name: "bg_press_bottom_padding";
+         mouse_events: 0;
+         type: RECT;
+         scale: 1;
+         description {
+            state: "default" 0.0;
+            visible: 0;
+            min: (CTXPOPUP_WIDTH_MIN_INC-CTXPOPUP_CONTENT_PADDING_WIDTH*2) CTXPOPUP_PRESS_PADDING2;
+            max: (CTXPOPUP_WIDTH_MAX_INC-CTXPOPUP_CONTENT_PADDING_WIDTH*2) CTXPOPUP_PRESS_PADDING2;
+            align: 0.5 1;
          }
       }
       part {
@@ -3565,14 +3797,7 @@ group {
          source: "over2";
          script {
             set_state(PART:"elm.text", "clicked", 0.0);
-
-            new st[31];
-            new Float:vl;
-            get_state(PART:"separator2", st, 30, vl);
-            if (!strcmp(st, "default"))
-              set_state(PART:"bg", "clicked", 0.0);
-            else
-              set_state(PART:"bg", "clicked_separator", 0.0);
+            set_state(PART:"bg", "clicked", 0.0);
          }
       }
       program {
@@ -4019,21 +4244,66 @@ group {
          description {
             state: "clicked" 0.0;
             visible: 1;
+            rel1 {to_x: "bg_press_left_padding"; to_y: "bg_press_top_padding"; relative: 1.0 1.0;}
+            rel2 {to_x: "bg_press_right_padding"; to_y: "bg_press_bottom_padding"; relative: 0.0 0.0;}
             image {
                normal: "00_more_popup_press.png";
                border: CTXPOPUP_BUBBLE_BG_PRESSED_IMAGE_BORDER;
                border_scale: 1;
             }
          }
+      }
+      part {
+         name: "bg_press_left_padding";
+         mouse_events: 0;
+         type: RECT;
+         scale: 1;
          description {
-            state: "clicked_separator" 0.0;
-            rel1 { relative: 0.0 1.0; to_y: "separator2"; }
-            visible: 1;
-            image {
-               normal: "00_more_popup_press.png";
-               border: CTXPOPUP_BUBBLE_BG_PRESSED_IMAGE_BORDER;
-               border_scale: 1;
-            }
+            state: "default" 0.0;
+            visible: 0;
+            min: CTXPOPUP_PRESS_PADDING CTXPOPUP_TOOLBAR_SEGMENTEDCONTROL_HEIGHT_MIN_INC;
+            max: CTXPOPUP_PRESS_PADDING CTXPOPUP_TOOLBAR_SEGMENTEDCONTROL_HEIGHT_MAX_INC;
+            align: 0 0.5;
+         }
+      }
+      part {
+         name: "bg_press_right_padding";
+         mouse_events: 0;
+         type: RECT;
+         scale: 1;
+         description {
+            state: "default" 0.0;
+            visible: 0;
+            min: CTXPOPUP_PRESS_PADDING CTXPOPUP_TOOLBAR_SEGMENTEDCONTROL_HEIGHT_MIN_INC;
+            max: CTXPOPUP_PRESS_PADDING CTXPOPUP_TOOLBAR_SEGMENTEDCONTROL_HEIGHT_MAX_INC;
+            align: 1 0.5;
+         }
+      }
+      part {
+         name: "bg_press_top_padding";
+         mouse_events: 0;
+         type: RECT;
+         scale: 1;
+         description {
+            state: "default" 0.0;
+            visible: 0;
+            min: (CTXPOPUP_TOOLBAR_SEGMENTEDCONTROL_WIDTH_MIN_INC-CTXPOPUP_SHADOW_LEFT_PADDING-CTXPOPUP_SHADOW_RIGHT_PADDING-CTXPOPUP_CONTENT_PADDING_WIDTH*2) CTXPOPUP_PRESS_PADDING2;
+            max: (CTXPOPUP_TOOLBAR_SEGMENTEDCONTROL_WIDTH_MIN_INC-CTXPOPUP_SHADOW_LEFT_PADDING-CTXPOPUP_SHADOW_RIGHT_PADDING-CTXPOPUP_CONTENT_PADDING_WIDTH*2) CTXPOPUP_PRESS_PADDING2;
+            rel1 {to: "separator2"; relative: 0.0 1.0;}
+            align: 0.5 0;
+         }
+      }
+      part {
+         name: "bg_press_bottom_padding";
+         mouse_events: 0;
+         type: RECT;
+         scale: 1;
+         description {
+            state: "default" 0.0;
+            visible: 0;
+            min: (CTXPOPUP_TOOLBAR_SEGMENTEDCONTROL_WIDTH_MIN_INC-CTXPOPUP_SHADOW_LEFT_PADDING-CTXPOPUP_SHADOW_RIGHT_PADDING-CTXPOPUP_CONTENT_PADDING_WIDTH*2) CTXPOPUP_PRESS_PADDING2;
+            max: (CTXPOPUP_TOOLBAR_SEGMENTEDCONTROL_WIDTH_MIN_INC-CTXPOPUP_SHADOW_LEFT_PADDING-CTXPOPUP_SHADOW_RIGHT_PADDING-CTXPOPUP_CONTENT_PADDING_WIDTH*2) CTXPOPUP_PRESS_PADDING2;
+            align: 0.5 1;
          }
       }
       part {
@@ -4044,8 +4314,8 @@ group {
          description {
             state: "default" 0.0;
             color: CTXPOPUP_SEPARATOR_COLOR_INC;
-            rel1 { relative: 1.0 0.0; to_x: "left_padding";}
-            rel2 { relative: 0.0 1.0; to_x: "right_padding"; offset: 0 0;}
+            rel1 { relative: 0.0 0.0; }
+            rel2 { relative: 1.0 1.0; }
             align: 0.5 0;
             min: 0 CTXPOPUP_SEPARATOR_PXLINE_SIZE_INC;
             max: 999999 CTXPOPUP_SEPARATOR_PXLINE_SIZE_INC;
@@ -4266,14 +4536,7 @@ group {
          source: "over2";
          script {
             set_state(PART:"elm.text", "clicked", 0.0);
-
-            new st[31];
-            new Float:vl;
-            get_state(PART:"separator2", st, 30, vl);
-            if (!strcmp(st, "default"))
-              set_state(PART:"bg", "clicked", 0.0);
-            else
-              set_state(PART:"bg", "clicked_separator", 0.0);
+            set_state(PART:"bg", "clicked", 0.0);
          }
       }
       program {
-- 
2.7.4