[popup] Apply Dark theme for popup UX version 0.6

Change-Id: I8152b0bc08a80627dc979005624b90c5aed7402d

Conflicts:

	themes/inc/tizen-dark-inc.edc

diff --git a/themes/images/HD/dark/Popup/00_popup_button_bg.png b/themes/images/HD/dark/Popup/00_popup_button_bg.png
index 11e17c6..a3b92e6 100644 (file)
Binary files a/themes/images/HD/dark/Popup/00_popup_button_bg.png and b/themes/images/HD/dark/Popup/00_popup_button_bg.png differ

diff --git a/themes/images/HD/dark/Popup/00_popup_title_bg.png b/themes/images/HD/dark/Popup/00_popup_title_bg.png
index ab43b59..ce8289d 100644 (file)
Binary files a/themes/images/HD/dark/Popup/00_popup_title_bg.png and b/themes/images/HD/dark/Popup/00_popup_title_bg.png differ

diff --git a/themes/inc/tizen-dark-inc.edc b/themes/inc/tizen-dark-inc.edc
index 512dcc4..67e8285 100755 (executable)
--- a/themes/inc/tizen-dark-inc.edc
+++ b/themes/inc/tizen-dark-inc.edc
@@ -872,8 +872,8 @@
 #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 32 47
-#define POPUP_BASE_DEFAULT_BUTTON_BG_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 652 78
 #define POPUP_BASE_DEFAULT_TITLE_LANDSCAPE_MIN_INC 832 78
 #define POPUP_BASE_DEFAULT_TITLE_VOLUMEBAR_MIN_INC 648 68
@@ -881,7 +881,7 @@
 #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
-#define POPUP_BASE_DEFAULT_BUTTON_BG_DEFAULT_MIN_INC 596 112
+#define POPUP_BASE_DEFAULT_BUTTON_BG_DEFAULT_MIN_INC 596 96
 
 #define POPUP_DESC_LEFT_PADDING 16
 #define POPUP_DESC_RIGHT_PADDING 16

diff --git a/themes/inc/tizen-light-inc.edc b/themes/inc/tizen-light-inc.edc
index b048a86..4167e23 100755 (executable)
--- a/themes/inc/tizen-light-inc.edc
+++ b/themes/inc/tizen-light-inc.edc
@@ -900,8 +900,8 @@
 #define POPUP_BASE_DEFAULT_BASE_LANDSCAPE_MIN_INC 900 0
 #define POPUP_BASE_DEFAULT_BASE_LANDSCAPE_MAX_INC 900 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 32 47
-#define POPUP_BASE_DEFAULT_BUTTON_BG_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

diff --git a/themes/widgets/popup.edc b/themes/widgets/popup.edc
index e89fbac..836cc6b 100644 (file)
--- a/themes/widgets/popup.edc
+++ b/themes/widgets/popup.edc
@@ -488,22 +488,6 @@ group { name: "elm/popup/base/default";
             fixed: 1 1;
          }
       }
-      part {
-         name:"bottom_padding";
-         type: SPACER;
-         scale: 1;
-         description { state: "default" 0.0;
-            min: POPUP_DESC_RIGHT_PADDING POPUP_DESC_BOTTOM_PADDING;
-            max: POPUP_DESC_RIGHT_PADDING POPUP_DESC_BOTTOM_PADDING;
-            align: 1 1;
-            fixed: 1 1;
-            rel1 {
-               relative: 0.0 1.0;
-               to: "base";
-            }
-            rel2.to: "base";
-         }
-      }
       part { name: "base";
          scale: 1;
          description { state: "default" 0.0;
@@ -852,11 +836,7 @@ group { name: "elm/popup/base/default";
             fixed: 0 1;
             align: 0.0 0.0;
             rel1.to: "elm.bg.action_area";
-            rel2 {
-               relative: 1.0 0.0;
-               to_x: "elm.bg.action_area";
-               to_y: "bottom_padding";
-            }
+            rel2.to: "elm.bg.action_area";
          }
       }
    }
@@ -2280,9 +2260,11 @@ group { name: "elm/popup/base/content_expand";
             fixed : 0 1;
             align: 0.5 0.0;
             visible: 0;
-            image.normal: "00_popup_title_bg.png";
-            image.border: POPUP_BASE_DEFAULT_TITLE_DEFAULT_IMAGE_BORDER_INC;
-            image.border_scale: 1;
+            image {
+               normal: "00_popup_title_bg.png";
+               border: POPUP_BASE_DEFAULT_TITLE_DEFAULT_IMAGE_BORDER_INC;
+               border_scale: 1;
+            }
             rel1.to_x: "base";
             rel2 {
                relative: 1.0 0.0;
@@ -2408,9 +2390,11 @@ group { name: "elm/popup/base/content_expand";
             fixed : 0 1;
             align: 0.5 1.0;
             visible: 0;
-            image.normal: "00_popup_button_bg.png";
-            image.border: POPUP_BASE_DEFAULT_BUTTON_BG_IMAGE_BORDER_INC;
-            image.border_scale: 1;
+            image {
+               normal: "00_popup_button_bg.png";
+               border: POPUP_BASE_DEFAULT_BUTTON_BG_IMAGE_BORDER_INC;
+               border_scale: 1;
+            }
             rel1 {
                relative: 0.0 1.0;
                to_x: "base";