[Popup] Added Macro for data item related to action area height in default and vertic...

Change-Id: I65b94132aba0f2b243fc30a3bf9ee35160b3b844

diff --git a/themes/inc/tizen-black-hd-inc.edc b/themes/inc/tizen-black-hd-inc.edc
index 12f8146..03f68cf 100644 (file)
--- a/themes/inc/tizen-black-hd-inc.edc
+++ b/themes/inc/tizen-black-hd-inc.edc
@@ -916,6 +916,7 @@
 
 #define POPUP_BUTTON3_VERTICAL_BUTTON_BG_IMAGE_BORDER_INC 3 3 3 3
 #define POPUP_BUTTON3_VERTICAL_BUTTON_PADDING_TOP_MIN_INC 0 16
+#define POPUP_BUTTON_VERTICAL_ACTION_AREA_HEIGHT "286"
 #define POPUP_BUTTON3_VERTICAL_BUTTON_BUTTON_MIN_MAX_INC 356 74
 #define POPUP_BUTTON3_VERTICAL_BUTTON_PADDING_BUTTON_MIN_INC 0 16
 #define POPUP_BUTTON3_VERTICAL_BUTTON_PADDING_BUTTON_MAX_INC 9999 16
@@ -943,10 +944,10 @@
 #define POPUP_BASE_CUSTOMSTYLE_CONTENT_CENTER_PADDING_MIN_INC 40
 
 #define POPUP_CONTENT_CUSTOMSTYLE_DEFAULT_MIN_INC 620 0
+#define POPUP_BUTTON_DEFAULT_ACTION_AREA_HEIGHT "96"
 #define POPUP_BUTTON1_DEFAULT_BUTTON1_DEFAULT_MIN_MAX_INC 402 74
 #define POPUP_BUTTON2_DEFAULT_BUTTON_DEFAULT_MIN_MAX_INC 274 74
 #define POPUP_BUTTON2_DEFAULT_PADDING_BUTTON_MIN_MAX_INC 10 74
-
 #define POPUP_BUTTON3_DEFAULT_BUTTON_DEFAULT_MIN_MAX_INC 186 74
 #define POPUP_BUTTON3_DEFAULT_PADDING_BUTTON_MIN_MAX_INC 10 74
 

diff --git a/themes/inc/tizen-black-inc.edc b/themes/inc/tizen-black-inc.edc
index 5d093a0..6abdd84 100644 (file)
--- a/themes/inc/tizen-black-inc.edc
+++ b/themes/inc/tizen-black-inc.edc
@@ -901,6 +901,7 @@
 
 #define POPUP_BUTTON3_VERTICAL_BUTTON_BG_IMAGE_BORDER_INC 3 3 3 3
 #define POPUP_BUTTON3_VERTICAL_BUTTON_PADDING_TOP_MIN_INC 0 10
+#define POPUP_BUTTON_VERTICAL_ACTION_AREA_HEIGHT "178"
 #define POPUP_BUTTON3_VERTICAL_BUTTON_BUTTON_MIN_MAX_INC 222 46
 #define POPUP_BUTTON3_VERTICAL_BUTTON_PADDING_BUTTON_MIN_INC 0 10
 #define POPUP_BUTTON3_VERTICAL_BUTTON_PADDING_BUTTON_MAX_INC 9999 10
@@ -928,10 +929,10 @@
 #define POPUP_BASE_CUSTOMSTYLE_CONTENT_CENTER_PADDING_MIN_INC 26
 
 #define POPUP_CONTENT_CUSTOMSTYLE_DEFAULT_MIN_INC 400 0
+#define POPUP_BUTTON_DEFAULT_ACTION_AREA_HEIGHT "60"
 #define POPUP_BUTTON1_DEFAULT_BUTTON1_DEFAULT_MIN_MAX_INC 252 46
 #define POPUP_BUTTON2_DEFAULT_BUTTON_DEFAULT_MIN_MAX_INC 172 46
 #define POPUP_BUTTON2_DEFAULT_PADDING_BUTTON_MIN_MAX_INC 6 46
-
 #define POPUP_BUTTON3_DEFAULT_BUTTON_DEFAULT_MIN_MAX_INC 120 46
 #define POPUP_BUTTON3_DEFAULT_PADDING_BUTTON_MIN_MAX_INC 6 46
 

diff --git a/themes/inc/tizen-hd-inc.edc b/themes/inc/tizen-hd-inc.edc
index e3e4faf..36ee43d 100644 (file)
--- a/themes/inc/tizen-hd-inc.edc
+++ b/themes/inc/tizen-hd-inc.edc
@@ -922,6 +922,7 @@
 
 #define POPUP_BUTTON3_VERTICAL_BUTTON_BG_IMAGE_BORDER_INC 3 3 3 3
 #define POPUP_BUTTON3_VERTICAL_BUTTON_PADDING_TOP_MIN_INC 0 16
+#define POPUP_BUTTON_VERTICAL_ACTION_AREA_HEIGHT "286"
 #define POPUP_BUTTON3_VERTICAL_BUTTON_BUTTON_MIN_MAX_INC 356 74
 #define POPUP_BUTTON3_VERTICAL_BUTTON_PADDING_BUTTON_MIN_INC 0 16
 #define POPUP_BUTTON3_VERTICAL_BUTTON_PADDING_BUTTON_MAX_INC 9999 16
@@ -949,10 +950,10 @@
 #define POPUP_BASE_CUSTOMSTYLE_CONTENT_CENTER_PADDING_MIN_INC 40
 
 #define POPUP_CONTENT_CUSTOMSTYLE_DEFAULT_MIN_INC 620 0
+#define POPUP_BUTTON_DEFAULT_ACTION_AREA_HEIGHT "96"
 #define POPUP_BUTTON1_DEFAULT_BUTTON1_DEFAULT_MIN_MAX_INC 402 74
 #define POPUP_BUTTON2_DEFAULT_BUTTON_DEFAULT_MIN_MAX_INC 274 74
 #define POPUP_BUTTON2_DEFAULT_PADDING_BUTTON_MIN_MAX_INC 10 74
-
 #define POPUP_BUTTON3_DEFAULT_BUTTON_DEFAULT_MIN_MAX_INC 186 74
 #define POPUP_BUTTON3_DEFAULT_PADDING_BUTTON_MIN_MAX_INC 10 74
 

diff --git a/themes/inc/tizen-inc.edc b/themes/inc/tizen-inc.edc
index 1ffc01e..3bdbb14 100644 (file)
--- a/themes/inc/tizen-inc.edc
+++ b/themes/inc/tizen-inc.edc
@@ -913,6 +913,7 @@
 
 #define POPUP_BUTTON3_VERTICAL_BUTTON_BG_IMAGE_BORDER_INC 3 3 3 3
 #define POPUP_BUTTON3_VERTICAL_BUTTON_PADDING_TOP_MIN_INC 0 10
+#define POPUP_BUTTON_VERTICAL_ACTION_AREA_HEIGHT "178"
 #define POPUP_BUTTON3_VERTICAL_BUTTON_BUTTON_MIN_MAX_INC 222 46
 #define POPUP_BUTTON3_VERTICAL_BUTTON_PADDING_BUTTON_MIN_INC 0 10
 #define POPUP_BUTTON3_VERTICAL_BUTTON_PADDING_BUTTON_MAX_INC 9999 10
@@ -940,10 +941,10 @@
 #define POPUP_BASE_CUSTOMSTYLE_CONTENT_CENTER_PADDING_MIN_INC 26
 
 #define POPUP_CONTENT_CUSTOMSTYLE_DEFAULT_MIN_INC 400 0
+#define POPUP_BUTTON_DEFAULT_ACTION_AREA_HEIGHT "60"
 #define POPUP_BUTTON1_DEFAULT_BUTTON1_DEFAULT_MIN_MAX_INC 252 46
 #define POPUP_BUTTON2_DEFAULT_BUTTON_DEFAULT_MIN_MAX_INC 172 46
 #define POPUP_BUTTON2_DEFAULT_PADDING_BUTTON_MIN_MAX_INC 6 46
-
 #define POPUP_BUTTON3_DEFAULT_BUTTON_DEFAULT_MIN_MAX_INC 120 46
 #define POPUP_BUTTON3_DEFAULT_PADDING_BUTTON_MIN_MAX_INC 6 46
 

diff --git a/themes/widgets/popup.edc b/themes/widgets/popup.edc
index a206340..84defb2 100644 (file)
--- a/themes/widgets/popup.edc
+++ b/themes/widgets/popup.edc
@@ -1040,6 +1040,7 @@ group { name: "elm/popup/base/verticalbuttonstyle";
 }
 
 group { name: "elm/popup/buttons3/verticalbuttonstyle";
+   data.item: "action_area_height" POPUP_BUTTON_VERTICAL_ACTION_AREA_HEIGHT;
    parts{
       part { name: "elm.swallow.buttonArea.Background";
          type: IMAGE;
@@ -1641,8 +1642,25 @@ group { name: "elm/popup/content/customstyle";
    }
 }
 
+group { name: "elm/popup/buttons1/default";
+   data.item: "action_area_height" POPUP_BUTTON_DEFAULT_ACTION_AREA_HEIGHT;
+   parts{
+      part{ name:"actionbtn1";
+         type: SWALLOW;
+         scale : 1;
+         description { state: "default" 0.0;
+            min: POPUP_BUTTON1_DEFAULT_BUTTON1_DEFAULT_MIN_MAX_INC;
+            max: POPUP_BUTTON1_DEFAULT_BUTTON1_DEFAULT_MIN_MAX_INC;
+            fixed : 1 1;
+            rel1.relative: 0.5 0.0;
+            rel2.relative: 0.5 1.0;
+         }
+      }
+   }
+}
+
 group { name: "elm/popup/buttons2/default";
-   data.item: "action_area_height" "140";
+   data.item: "action_area_height" POPUP_BUTTON_DEFAULT_ACTION_AREA_HEIGHT;
    parts{
       part{ name:"actionbtn1";
          type: SWALLOW;
@@ -1691,7 +1709,7 @@ group { name: "elm/popup/buttons2/default";
 
 group { name: "elm/popup/buttons3/default";
    alias: "elm/popup/buttons3/menustyle";
-   data.item: "action_area_height" "140";
+   data.item: "action_area_height" POPUP_BUTTON_DEFAULT_ACTION_AREA_HEIGHT;
    parts{
       part{ name:"actionbtn1";
          type: SWALLOW;