[timepicker] scale consideration

Change-Id: I22897dc210fb697302193905331a96b9a3ba6d28

diff --git a/themes/groups/ctxpopup.edc b/themes/groups/ctxpopup.edc
index b3e2822..e05d4a0 100644 (file)
--- a/themes/groups/ctxpopup.edc
+++ b/themes/groups/ctxpopup.edc
@@ -660,6 +660,7 @@
                        part { name: "arrow_area_left";
                                type: RECT;
                                mouse_events: 0;
+                               scale: 1;
                                description { state: "default" 0.0;
                                        visible: 0;
                                        min: 40 0;
@@ -678,6 +679,7 @@
                        part { name: "arrow_area_right";
                                type: RECT;
                                mouse_events: 0;
+                               scale: 1;
                                description { state: "default" 0.0;
                                        visible: 0;
                                        min: 40 0;
@@ -696,6 +698,7 @@
                        part { name: "arrow_area_up";
                                type: RECT;
                                mouse_events: 0;
+                               scale: 1;
                                description { state: "default" 0.0;
                                        visible: 0;
                                        min: 0 40;
@@ -714,6 +717,7 @@
                        part { name: "arrow_area_down";
                                type: RECT;
                                mouse_events: 0;
+                               scale: 1;
                                description { state: "default" 0.0;
                                        visible: 0;
                                        min: 0 40;
@@ -3020,20 +3024,166 @@ group {
                        description {
                                color: CTXPOPUP_TP_BG_COLOR;
                                min: 1 CTXPOPUP_TP_HEIGHT;
-                       max: CTXPOPUP_TP_CONTENT_MAX CTXPOPUP_TP_HEIGHT;
+                               max: CTXPOPUP_TP_CONTENT_MAX CTXPOPUP_TP_HEIGHT;
+                               fixed: 1 1;
+                               rel1 { to: "elm.swallow.content"; }
+                               rel2 { to: "elm.swallow.content"; }
                        }
                }
                part {
                        name: "elm.swallow.content";
                        type: SWALLOW;
+                       scale: 1;
                        description {
                                state: "default" 0.0;
                                min: 1 CTXPOPUP_TP_HEIGHT;
-                       max: CTXPOPUP_TP_CONTENT_MAX CTXPOPUP_TP_HEIGHT;
-                       align: 0 0;
-                               rel1 { to: "ctxpopup_frame"; }
+                               max: CTXPOPUP_TP_CONTENT_MAX CTXPOPUP_TP_HEIGHT;
                        }
                }
+               part { name: "arrow_area_left";
+                               type: RECT;
+                               mouse_events: 0;
+                               scale: 1;
+                               description { state: "default" 0.0;
+                                       visible: 0;
+                                       min: 20 0;
+                                       max: 20 CTXPOPUP_TP_HEIGHT;
+                                       fixed: 1 1;
+                                       align: 1 0.5;
+                                       rel1 {
+                                               relative: 0 0;
+                                               to_y: "ctxpopup_frame";
+                                       }
+                                       rel2 {
+                                               relative:0 1;
+                                               to:"ctxpopup_frame";
+                                       }
+                               }
+                       }
+                       part { name: "arrow_area_right";
+                               type: RECT;
+                               mouse_events: 0;
+                               scale: 1;
+                               description { state: "default" 0.0;
+                                       visible: 0;
+                                       min: 20 0;
+                                       max: 20 CTXPOPUP_TP_HEIGHT;
+                                       fixed: 1 1;
+                                       align: 0 0.5;
+                                       rel1 {
+                                               relative: 1 0;
+                                               to:"ctxpopup_frame";
+                                       }
+                                       rel2 {
+                                               relative: 1 1;
+                                               to_y: "ctxpopup_frame";
+                                       }
+                               }
+                       }
+                       part { name: "arrow_area_up";
+                               type: RECT;
+                               mouse_events: 0;
+                               scale: 1;
+                               description { state: "default" 0.0;
+                                       visible: 0;
+                                       min: 0 20;
+                                       max: CTXPOPUP_TP_CONTENT_MAX 20;
+                                       fixed: 1 1;
+                                       align: 0.5 1;
+                                       rel1 {
+                                               relative: 0 0;
+                                               to_x: "ctxpopup_frame";
+                                       }
+                                       rel2 {
+                                               relative: 1 0;
+                                               to:"ctxpopup_frame";
+                                       }
+                               }
+                       }
+                       part { name: "arrow_area_down";
+                               type: RECT;
+                               mouse_events: 0;
+                               scale: 1;
+                               description { state: "default" 0.0;
+                                       visible: 0;
+                                       min: 0 20;
+                                       max: CTXPOPUP_TP_CONTENT_MAX 20;
+                                       fixed: 1 1;
+                                       align: 0.5 0;
+                                       rel1 {
+                                               relative: 0 1;
+                                               to:"ctxpopup_frame";
+                                       }
+                                       rel2 {
+                                               relative: 1 1;
+                                               to_x: "ctxpopup_frame";
+                                       }
+                               }
+                       }
+                       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: 20 20;
+                                       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: 20 20;
+                                       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: 20 20;
+                                       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: 20 20;
+                                       fixed: 1 1;
+                                       visible: 1;
+                               }
+                       }
        }
 }
 ///////////////////////////////////////////////////////////////////////////////
@@ -3062,7 +3212,7 @@ group { name: "elm/ctxpopup/arrow/extended/timepicker";
                                min: CTXPOPUP_TP_ARROW_SIZE CTXPOPUP_TP_ARROW_SIZE;
                                max: CTXPOPUP_TP_ARROW_SIZE CTXPOPUP_TP_ARROW_SIZE;
                                fixed: 1 1;
-                               align: 0.0 0.5;
+                               align: 1.0 0.5;
                                image {
                                        normal: "timepicker_left_arrow.png";
                                }
@@ -3072,7 +3222,7 @@ group { name: "elm/ctxpopup/arrow/extended/timepicker";
                                min: CTXPOPUP_TP_ARROW_SIZE CTXPOPUP_TP_ARROW_SIZE;
                                max: CTXPOPUP_TP_ARROW_SIZE CTXPOPUP_TP_ARROW_SIZE;
                                fixed: 1 1;
-                               align: 1.0 0.5;
+                               align: 0.0 0.5;
                                image {
                                        normal: "timepicker_right_arrow.png";
                                }
@@ -3082,7 +3232,7 @@ group { name: "elm/ctxpopup/arrow/extended/timepicker";
                                min: CTXPOPUP_TP_ARROW_SIZE CTXPOPUP_TP_ARROW_SIZE;
                                max: CTXPOPUP_TP_ARROW_SIZE CTXPOPUP_TP_ARROW_SIZE;
                                fixed: 1 1;
-                               align: 0.5 0.0;
+                               align: 0.5 1.0;
                                image {
                                        normal: "timepicker_top_arrow.png";
                                }
@@ -3092,7 +3242,7 @@ group { name: "elm/ctxpopup/arrow/extended/timepicker";
                                min: CTXPOPUP_TP_ARROW_SIZE CTXPOPUP_TP_ARROW_SIZE;
                                max: CTXPOPUP_TP_ARROW_SIZE CTXPOPUP_TP_ARROW_SIZE;
                                fixed: 1 1;
-                               align: 0.5 1.0;
+                               align: 0.5 0.0;
                                image {
                                        normal: "timepicker_bottom_arrow.png";
                                }