[popup] Modified title area for popup and changed white theme values according to...

Change-Id: I8515090d14c1fa686aa46d62db17f29aa9e6fde5

Conflicts:

	themes/inc/tizen-dark-inc.edc

diff --git a/themes/inc/tizen-dark-inc.edc b/themes/inc/tizen-dark-inc.edc
index 35c8b9a..6096202 100755 (executable)
--- a/themes/inc/tizen-dark-inc.edc
+++ b/themes/inc/tizen-dark-inc.edc
@@ -871,8 +871,7 @@
 #define POPUP_BASE_DEFAULT_BUTTON_BG_IMAGE_BORDER_INC 26 26 30 31
 #define POPUP_BASE_DEFAULT_TITLE_DEFAULT_MIN_INC 652 78
 #define POPUP_BASE_DEFAULT_TITLE_LANDSCAPE_MIN_INC 832 78
-#define POPUP_BASE_DEFAULT_TITLE_VOLUMEBAR_MIN_INC 648 68
-#define POPUP_BASE_DEFAULT_PADDING_MIN_MAX_INC 18 16
+#define POPUP_BASE_DEFAULT_PADDING_MIN_MAX_INC 28 0
 #define POPUP_BASE_DEFAULT_TITLE_ICON_DEFAULT_MIN_MAX_INC 64 64
 #define POPUP_BASE_DEFAULT_CONTENT_DEFAULT_MIN_MAX_INC 630 300
 #define POPUP_BASE_DEFAULT_CONTENT_LANDSCAPE_MIN_MAX_INC 810 300
@@ -887,9 +886,9 @@
 #define POPUP_ACTION_DESC_TOP_PADDING 11
 #define POPUP_TITLE_LEFT_PADDING 42
 #define POPUP_TITLE_RIGHT_PADDING 42
-#define POPUP_TITLE_TOP_PADDING 20
+#define POPUP_TITLE_TOP_PADDING 0
 #define POPUP_TITLE_BOTTOM_PADDING 0
-#define POPUP_TITLE_ICON_TEXT_PADDING_INC 16 0
+#define POPUP_TITLE_ICON_TEXT_PADDING_INC 16 10
 
 #define POPUP_CONTENT_DEFAULT_PADDING_TOP_MIN_INC 32
 #define POPUP_CONTENT_DEFAULT_PADDING_LEFT_MIN_INC 42
@@ -904,7 +903,7 @@
 #define POPUP_BASE_VERTICAL_BUTTON_BUTTONAREA_DEFAULT_MIN_INC 568 296
 
 #define POPUP_BUTTON3_VERTICAL_BUTTON_PADDING_TOP_MIN_INC 0 10
-#define POPUP_BUTTON_VERTICAL_ACTION_AREA_HEIGHT "296"
+#define POPUP_BUTTON3_VERTICAL_ACTION_AREA_HEIGHT "296"
 #define POPUP_BUTTON3_VERTICAL_BUTTON_BUTTON_MIN_MAX_INC 394 76
 #define POPUP_BUTTON3_VERTICAL_BUTTON_PADDING_BUTTON_MIN_INC 0 24
 #define POPUP_BUTTON3_VERTICAL_BUTTON_PADDING_BUTTON_MAX_INC 9999 24

diff --git a/themes/inc/tizen-light-inc.edc b/themes/inc/tizen-light-inc.edc
index 713b97d..315b188 100755 (executable)
--- a/themes/inc/tizen-light-inc.edc
+++ b/themes/inc/tizen-light-inc.edc
@@ -866,15 +866,14 @@
 #define SELECTION_INFO_MIN_VER_BOTTOM_64_H_INC       150
 #define SELECTION_INFO_MIN_VER_BOTTOM_86_H_INC       186
 
-
-#define POPUP_ITEM_BG_DEFAULT_MIN_INC 648 112
-#define POPUP_ITEM_LEFT_MIN_PADDING_INC 5 0
-#define POPUP_ITEM_RIGHT_MIN_PADDING_INC 5 0
+#define POPUP_ITEM_BG_DEFAULT_MIN_INC 620 112
+#define POPUP_ITEM_LEFT_MIN_PADDING_INC 26 0
+#define POPUP_ITEM_RIGHT_MIN_PADDING_INC 26 0
 #define POPUP_ITEM_ICON_TEXT_PADDING_INC 16 0
 #define POPUP_ITEM_TEXT_DISABLED_COLOR_INC 128 128 128 255
 #define POPUP_ITEM_TEXT_DISABLED_VISIBLE_COLOR_INC 128 128 128 255
 
-#define POPUP_ITEM_BG_LANDCAPE_MIN_INC 828 112
+#define POPUP_ITEM_BG_LANDCAPE_MIN_INC 800 112
 
 #define POPUP_DEFAULT_TITLE_TEXT_COLOR_INC "#3b73b6"
 #define POPUP_DEFAULT_TITLE_TEXT_SHADOW_COLOR "#ffffff"
@@ -890,34 +889,33 @@
 #define POPUP_BASE_DEFAULT_TEXT_FONT_SIZE_INC 50
 #define POPUP_DESCRIPTION_DEFAULT_TEXT_FONT_SIZE_INC 38
 
-#define POPUP_BASE_DEFAULT_BASE_DEFAULT_MIN_INC 720 0
-#define POPUP_BASE_DEFAULT_BASE_DEFAULT_MAX_INC 720 1120
-#define POPUP_BASE_DEFAULT_BASE_LANDSCAPE_MIN_INC 900 0
-#define POPUP_BASE_DEFAULT_BASE_LANDSCAPE_MAX_INC 900 720
+#define POPUP_BASE_DEFAULT_BASE_DEFAULT_MIN_INC 652 0
+#define POPUP_BASE_DEFAULT_BASE_DEFAULT_MAX_INC 652 1120
+#define POPUP_BASE_DEFAULT_BASE_LANDSCAPE_MIN_INC 832 0
+#define POPUP_BASE_DEFAULT_BASE_LANDSCAPE_MAX_INC 832 720
 #define POPUP_BASE_DEFAULT_BG_DEFAULT_IMAGE_BORDER_INC 26 26 32 47
 #define POPUP_BASE_DEFAULT_TITLE_DEFAULT_IMAGE_BORDER_INC 26 26 30 31
 #define POPUP_BASE_DEFAULT_BUTTON_BG_IMAGE_BORDER_INC 26 26 30 31
-#define POPUP_BASE_DEFAULT_TITLE_DEFAULT_MIN_INC 636 78
-#define POPUP_BASE_DEFAULT_TITLE_LANDSCAPE_MIN_INC 816 78
-#define POPUP_BASE_DEFAULT_TITLE_VOLUMEBAR_MIN_INC 648 68
-#define POPUP_BASE_DEFAULT_PADDING_MIN_MAX_INC 30 10
+#define POPUP_BASE_DEFAULT_TITLE_DEFAULT_MIN_INC 652 78
+#define POPUP_BASE_DEFAULT_TITLE_LANDSCAPE_MIN_INC 832 78
+#define POPUP_BASE_DEFAULT_PADDING_MIN_MAX_INC 28 0
 #define POPUP_BASE_DEFAULT_TITLE_ICON_DEFAULT_MIN_MAX_INC 64 64
 #define POPUP_BASE_DEFAULT_CONTENT_DEFAULT_MIN_MAX_INC 630 0
 #define POPUP_BASE_DEFAULT_CONTENT_LANDSCAPE_MIN_MAX_INC 810 0
-#define POPUP_BASE_DEFAULT_BUTTON_BG_DEFAULT_MIN_INC 648 114
+#define POPUP_BASE_DEFAULT_BUTTON_BG_DEFAULT_MIN_INC 596 96
 
 #define POPUP_DESC_LEFT_PADDING 16
 #define POPUP_DESC_RIGHT_PADDING 16
 #define POPUP_DESC_TOP_PADDING 14
-#define POPUP_DESC_BOTTOM_PADDING 34
+#define POPUP_DESC_BOTTOM_PADDING 16
 #define POPUP_LABEL_DESC_TOP_PADDING 32
 #define POPUP_LABEL_DESC_BOTTOM_PADDING 32
-#define POPUP_ACTION_DESC_TOP_PADDING 20
+#define POPUP_ACTION_DESC_TOP_PADDING 11
 #define POPUP_TITLE_LEFT_PADDING 42
 #define POPUP_TITLE_RIGHT_PADDING 42
-#define POPUP_TITLE_TOP_PADDING 20
+#define POPUP_TITLE_TOP_PADDING 0
 #define POPUP_TITLE_BOTTOM_PADDING 0
-#define POPUP_TITLE_ICON_TEXT_PADDING_INC 16 0
+#define POPUP_TITLE_ICON_TEXT_PADDING_INC 16 10
 
 #define POPUP_CONTENT_DEFAULT_PADDING_TOP_MIN_INC 32
 #define POPUP_CONTENT_DEFAULT_PADDING_LEFT_MIN_INC 42
@@ -926,39 +924,39 @@
 #define POPUP_CONTENT_DEFAULT_CONTENT_DEFAULT_MIN_INC 630 0
 #define POPUP_CONTENT_DEFAULT_CONTENT_LANDSCAPE_MIN_INC 810 0
 
-#define POPUP_BASE_CONTENT_EXPAND_BG_DEFAULT_MIN_INC 0 114
+#define POPUP_BASE_CONTENT_EXPAND_BG_DEFAULT_MIN_INC 0 96
 #define POPUP_BASE_CONTENT_EXPAND_TITLE_DEFAULT_MIN_INC 0 78
 
-#define POPUP_BASE_VERTICAL_BUTTON_BUTTONAREA_DEFAULT_MIN_INC 648 324
+#define POPUP_BASE_VERTICAL_BUTTON_BUTTONAREA_DEFAULT_MIN_INC 568 296
 
-#define POPUP_BUTTON3_VERTICAL_BUTTON_PADDING_TOP_MIN_INC 0 20
-#define POPUP_BUTTON_VERTICAL_ACTION_AREA_HEIGHT "324"
-#define POPUP_BUTTON3_VERTICAL_BUTTON_BUTTON_MIN_MAX_INC 394 74
+#define POPUP_BUTTON3_VERTICAL_BUTTON_PADDING_TOP_MIN_INC 0 10
+#define POPUP_BUTTON3_VERTICAL_ACTION_AREA_HEIGHT "296"
+#define POPUP_BUTTON3_VERTICAL_BUTTON_BUTTON_MIN_MAX_INC 394 76
 #define POPUP_BUTTON3_VERTICAL_BUTTON_PADDING_BUTTON_MIN_INC 0 24
 #define POPUP_BUTTON3_VERTICAL_BUTTON_PADDING_BUTTON_MAX_INC 9999 24
 
-#define POPUP_CONTENT_LISTSTYLE_PADDING_TOP_MIN_MAX_INC 17 20
-#define POPUP_CONTENT_LISTSTYLE_CONTENT_DEFAULT_MIN_INC 614 408
-#define POPUP_CONTENT_LISTSTYLE_PADDING_RIGHT_MIN_INC 17 0
+#define POPUP_CONTENT_LISTSTYLE_PADDING_TOP_MIN_MAX_INC 0 20
+#define POPUP_CONTENT_LISTSTYLE_CONTENT_DEFAULT_MIN_INC 568 408
+#define POPUP_CONTENT_LISTSTYLE_PADDING_RIGHT_MIN_INC 0 0
 
 #define POPUP_CONTENT_MINSTYLE_LEFT_PADDING_MIN_INC 16
 #define POPUP_CONTENT_MINSTYLE_RIGHT_PADDING_MIN_INC 16
-#define POPUP_CONTENT_MINSTYLE_CONTENT_DEFAULT_MIN_INC 686 0
+#define POPUP_CONTENT_MINSTYLE_CONTENT_DEFAULT_MIN_INC 568 0
 #define POPUP_CONTENT_MINSTYLE_CONTENT_LANDSCAPE_MIN_INC 866 0
-#define POPUP_CONTENT_VOLUMEBAR_STYLE_CONTENT_DEFAULT_MIN_INC 648 134
-#define POPUP_CONTENT_VOLUMEBAR_TEXT_STYLE_CONTENT_DEFAULT_MIN_INC 648 250
+#define POPUP_CONTENT_VOLUMEBAR_STYLE_CONTENT_DEFAULT_MIN_INC 596 134
+#define POPUP_CONTENT_VOLUMEBAR_TEXT_STYLE_CONTENT_DEFAULT_MIN_INC 596 250
 #define POPUP_BASE_VOLUMEBAR_STYLE_BUTTONAREA_BG_DEFAULT_MIN_INC 648 134
 
-#define POPUP_BUTTON_DEFAULT_ACTION_AREA_HEIGHT "114"
-#define POPUP_BUTTON1_DEFAULT_BUTTON1_DEFAULT_MIN_INC 395 74
-#define POPUP_BUTTON1_DEFAULT_BUTTON1_DEFAULT_MAX_INC 648 74
-#define POPUP_BUTTON2_DEFAULT_HEIGHT_INC 74
-#define POPUP_BUTTON2_DEFAULT_BUTTON_DEFAULT_MIN_MAX_INC 314 74
-#define POPUP_BUTTON2_DEFAULT_PADDING_BUTTON_MIN_MAX_INC 16 74
-#define POPUP_BUTTON2_DEFAULT_PADDING_LEFT_RIGHT_WIDTH_INC 36
-#define POPUP_BUTTON3_DEFAULT_HEIGHT_INC 74
-#define POPUP_BUTTON3_DEFAULT_PADDING_BUTTON_MIN_MAX_INC 16 74
-#define POPUP_BUTTON3_DEFAULT_PADDING_LEFT_RIGHT_WIDTH_INC 36
+#define POPUP_BUTTON_DEFAULT_ACTION_AREA_HEIGHT "96"
+#define POPUP_BUTTON1_DEFAULT_BUTTON1_DEFAULT_MIN_INC 396 76
+#define POPUP_BUTTON1_DEFAULT_BUTTON1_DEFAULT_MAX_INC 604 76
+#define POPUP_BUTTON2_DEFAULT_HEIGHT_INC 76
+#define POPUP_BUTTON2_DEFAULT_BUTTON_DEFAULT_MIN_MAX_INC 314 76
+#define POPUP_BUTTON2_DEFAULT_PADDING_BUTTON_MIN_MAX_INC 16 76
+#define POPUP_BUTTON2_DEFAULT_PADDING_LEFT_RIGHT_WIDTH_INC 28
+#define POPUP_BUTTON3_DEFAULT_HEIGHT_INC 76
+#define POPUP_BUTTON3_DEFAULT_PADDING_BUTTON_MIN_MAX_INC 10 76
+#define POPUP_BUTTON3_DEFAULT_PADDING_LEFT_RIGHT_WIDTH_INC 28
 
 #define PROGRESSBAR_LIST_PROGRESS_STYLE_TEXT_COLOR_INC          128 128 128 255
 #define PROGRESSBAR_LIST_PROGRESS_STYLE_STATUS_TEXT_COLOR_INC          128 128 128 255

diff --git a/themes/widgets/popup.edc b/themes/widgets/popup.edc
index 836cc6b..49d8b5a 100644 (file)
--- a/themes/widgets/popup.edc
+++ b/themes/widgets/popup.edc
@@ -521,12 +521,14 @@ group { name: "elm/popup/base/default";
                border_scale: 1;
             }
             rel1 {
-               relative: 0.5 0.0;
-               to: "base";
+               relative: 0.0 1.0;
+               to_x: "base";
+               to_y: "shadow_left_top_padding";
             }
             rel2 {
-               relative: 0.5 0.0;
-               to: "base";
+               relative: 1.0 1.0;
+               to_x: "base";
+               to_y: "shadow_left_top_padding";
             }
             fill.smooth: 0;
          }
@@ -682,7 +684,6 @@ group { name: "elm/popup/base/default";
               size_range: POPUP_BASE_DEFAULT_TEXT_MIN_FONT_SIZE_INC POPUP_BASE_DEFAULT_TEXT_FONT_SIZE_INC;
               fit: 1 0;
               min: 0 1;
-              align: 0.0 0.0;
             }
             rel1 {
                relative: 1.0 0.0;
@@ -1585,7 +1586,7 @@ group { name: "elm/label/base/popup/verticalbuttonstyle";
 
 group { name: "elm/popup/buttons3/verticalbuttonstyle";
    alias: "elm/popup/buttons3/verticalbuttonstyle_transparent";
-   data.item: "action_area_height" POPUP_BUTTON_VERTICAL_ACTION_AREA_HEIGHT;
+   data.item: "action_area_height" POPUP_BUTTON3_VERTICAL_ACTION_AREA_HEIGHT;
    parts {
       part { name: "bg";
          scale : 1;
@@ -2253,6 +2254,17 @@ group { name: "elm/popup/base/content_expand";
             align: 0.0 0.0;
          }
       }
+      part {
+         name:"shadow_left_top_padding";
+         type: SPACER;
+         scale: 1;
+         description { state: "default" 0.0;
+            min: POPUP_DESC_LEFT_PADDING POPUP_DESC_TOP_PADDING;
+            max: POPUP_DESC_LEFT_PADDING POPUP_DESC_TOP_PADDING;
+            align: 0 0;
+            fixed: 1 1;
+         }
+      }
       part { name: "elm.bg.title";
          scale : 1;
          description { state: "default" 0.0;
@@ -2265,10 +2277,15 @@ group { name: "elm/popup/base/content_expand";
                border: POPUP_BASE_DEFAULT_TITLE_DEFAULT_IMAGE_BORDER_INC;
                border_scale: 1;
             }
-            rel1.to_x: "base";
+            rel1 {
+               relative: 0.0 1.0;
+               to_x: "base";
+               to_y: "shadow_left_top_padding";
+            }
             rel2 {
-               relative: 1.0 0.0;
+               relative: 1.0 1.0;
                to_x: "base";
+               to_y: "shadow_left_top_padding";
             }
          }
          description { state: "visible" 0.0;
@@ -2331,7 +2348,6 @@ group { name: "elm/popup/base/content_expand";
               size_range: POPUP_BASE_DEFAULT_TEXT_MIN_FONT_SIZE_INC POPUP_BASE_DEFAULT_TEXT_FONT_SIZE_INC;
               fit: 1 0;
               min: 0 1;
-              align: 0.0 0.0;
             }
             visible: 0;
             rel1 {