[Popup] Fixed popup height. Patch by Cinoo <cinoo.kim@samsung.com>

Change-Id: I509a94211e7be44fbdbea491fda0e713bc0a8529

2 files changed, 17 insertions, 9 deletions

diff --git a/themes/inc/tizen-hd-inc.edc b/themes/inc/tizen-hd-inc.edc
index 5d7137ae..f1aa4279 100644
--- a/themes/inc/tizen-hd-inc.edc
+++ b/themes/inc/tizen-hd-inc.edc
@@ -873,7 +873,7 @@
 #define SELECTION_INFO_MIN_VER_BOTTOM_64_H_INC       150
 #define SELECTION_INFO_MIN_VER_BOTTOM_86_H_INC       186
 
-#define POPUP_DESCRIPTION_DEFAULT_TEXT_MIN_INC 588 0
+#define POPUP_DESCRIPTION_DEFAULT_TEXT_MIN_INC 588 300
 #define POPUP_DESCRIPTION_DEFAULT_TEXT_FONT_SIZE_INC 42
 
 #define POPUP_BASE_DEFAULT_BASE_DEFAULT_MIN_INC 620 0
@@ -884,7 +884,7 @@
 #define POPUP_BASE_DEFAULT_TITLE_DEFAULT_IMAGE_BORDER_INC 3 3 3 3
 #define POPUP_BASE_DEFAULT_PADDING_MIN_MAX_INC 14 0
 #define POPUP_BASE_DEFAULT_TITLE_ICON_DEFAULT_MIN_MAX_INC 62 62
-#define POPUP_BASE_DEFAULT_CONTENT_DEFAULT_MIN_MAX_INC 620 0
+#define POPUP_BASE_DEFAULT_CONTENT_DEFAULT_MIN_MAX_INC 620 300
 #define POPUP_BASE_DEFAULT_BUTTON_BG_DEFAULT_MIN_INC 620 96
 #define POPUP_BASE_DEFAULT_BUTTON_BG_IMAGE_BORDER_INC 3 3 3 3
 #define POPUP_BASE_DEFAULT_TEXT_FONT_SIZE_INC 38
@@ -901,7 +901,7 @@
 #define POPUP_BASE_VERTICAL_BUTTON_TITLE_DEFAULT_MIN_INC 620 64
 #define POPUP_BASE_VERTICAL_BUTTON_TITLE_IMAGE_BORDER_MIN_INC 3 3 3 3
 #define POPUP_BASE_VERTICAL_BUTTON_TITLE_ICON_MIN_MAX_INC 62 62
-#define POPUP_BASE_VERTICAL_BUTTON_CONTENT_DEFAULT_MIN_INC 620 0
+#define POPUP_BASE_VERTICAL_BUTTON_CONTENT_DEFAULT_MIN_INC 620 300
 #define POPUP_BASE_VERTICAL_BUTTON_BUTTONAREA_DEFAULT_MIN_INC 620 286
 
 #define POPUP_BUTTON3_VERTICAL_BUTTON_BG_IMAGE_BORDER_INC 3 3 3 3
@@ -912,7 +912,7 @@
 #define POPUP_BUTTON3_VERTICAL_BUTTON_PADDING_BUTTON_MAX_INC 9999 16
 
 #define POPUP_CONTENT_LISTSTYLE_PADDING_TOP_MIN_MAX_INC 3 3
-#define POPUP_CONTENT_LISTSTYLE_CONTENT_DEFAULT_MIN_INC 614 408
+#define POPUP_CONTENT_LISTSTYLE_CONTENT_DEFAULT_MIN_INC 614 300
 #define POPUP_CONTENT_LISTSTYLE_PADDING_RIGHT_MIN_INC 3 0
 
 #define POPUP_CONTENT_MINSTYLE_CONTENT_DEFAULT_MIN_INC 614 0
@@ -923,7 +923,7 @@
 #define POPUP_BASE_CUSTOMSTYLE_TITLE_DEFAULT_MIN_INC 620 64
 #define POPUP_BASE_CUSTOMSTYLE_TITLE_BOTTOM_LINE_MIN_INC 0 1
 #define POPUP_BASE_CUSTOMSTYLE_TITLE_ICON_DEFAULT_MIN_MAX_INC 62 62
-#define POPUP_BASE_CUSTOMSTYLE_CONTENT_DEFAULT_MIN_INC 620 0
+#define POPUP_BASE_CUSTOMSTYLE_CONTENT_DEFAULT_MIN_INC 620 300
 #define POPUP_BASE_CUSTOMSTYLE_BUTTONAREA_BG_DEFAULT_MIN_INC 620 96
 #define POPUP_BASE_CUSTOMSTYLE_BUTTONAREA_BG_IMAGE_BORDER_INC 3 3 3 3
 #define POPUP_BASE_CUSTOMSTYLE_TEXT_FONT_SIZE_INC 38
@@ -950,7 +950,7 @@
 #define POPUP_CONTENT_VOLUMEBAR_STYLE_PADDING_TOP_MIN_INC 0 31
 #define POPUP_CONTENT_VOLUMEBAR_STYLE_PADDING_LEFT_MIN_INC 40 0
 #define POPUP_CONTENT_VOLUMEBAR_STYLE_PADDING_RIGHT_MIN_INC 40 0
-#define POPUP_CONTENT_VOLUMEBAR_STYLE_CONTENT_DEFAULT_MIN_INC 544 64
+#define POPUP_CONTENT_VOLUMEBAR_STYLE_CONTENT_DEFAULT_MIN_INC 544 300
 #define POPUP_CONTENT_VOLUMEBAR_STYLE_PADDING_BOTTOM_MIN_INC 0 31
 
 #define PROGRESSBAR_DEFAULT_STYLE_TEXT_COLOR_INC          249 249 249 255
diff --git a/themes/widgets/popup.edc b/themes/widgets/popup.edc
index 4ca9506c..e11529e7 100644
--- a/themes/widgets/popup.edc
+++ b/themes/widgets/popup.edc
@@ -206,7 +206,7 @@ group { name: "elm/label/base/popup/default";
    styles
      {
         style { name: "popup_desc_style";
-           base: "font=SLP:style=Roman font_size="POPUP_DESCRIPTION_DEFAULT_TEXT_FONT_SIZE_INC" align=center color="POPUP_DEFAULT_DESCRIPTION_TEXT_COLOR_INC" text_class=slp_roman";
+           base: "font=SLP:style=Roman font_size="POPUP_DESCRIPTION_DEFAULT_TEXT_FONT_SIZE_INC" align=center color="POPUP_DEFAULT_DESCRIPTION_TEXT_COLOR_INC" text_class=slp_roman wrap=mixed ellipsis=1";
            tag:  "br" "\n";
            tag:  "ps" "ps";
            tag:  "whitecolor" "+ color=#ffffff";
@@ -220,10 +220,10 @@ group { name: "elm/label/base/popup/default";
          scale: 1;
          description { state: "default" 0.0;
             min: POPUP_DESCRIPTION_DEFAULT_TEXT_MIN_INC;
+            max: POPUP_DESCRIPTION_DEFAULT_TEXT_MIN_INC;
             text {
                style: "popup_desc_style";
-               min: 0 1;
-               max: 0 1;
+               min: 0 0;
             }
          }
       }
@@ -362,6 +362,7 @@ group { name: "elm/popup/base/default";
          scale : 1;
          description { state: "default" 0.0;
             min: POPUP_BASE_DEFAULT_CONTENT_DEFAULT_MIN_MAX_INC;
+            max: POPUP_BASE_DEFAULT_CONTENT_DEFAULT_MIN_MAX_INC;
             fixed: 1 0;
             rel1 {
                relative: 0.5 0.0;
@@ -1005,6 +1006,7 @@ group { name: "elm/popup/base/verticalbuttonstyle";
          scale : 1;
          description { state: "default" 0.0;
             min: POPUP_BASE_VERTICAL_BUTTON_CONTENT_DEFAULT_MIN_INC;
+            max: POPUP_BASE_VERTICAL_BUTTON_CONTENT_DEFAULT_MIN_INC;
             fixed: 1 0;
             rel1 {
                relative: 0.5 0.0;
@@ -1273,6 +1275,7 @@ group { name: "elm/popup/content/menustyle";
          scale : 1;
          description { state: "default" 0.0;
             min: POPUP_CONTENT_LISTSTYLE_CONTENT_DEFAULT_MIN_INC;
+            max: POPUP_CONTENT_LISTSTYLE_CONTENT_DEFAULT_MIN_INC;
             align: 0.5 0.5;
             fixed: 1 0;
             rel1 {
@@ -1376,6 +1379,7 @@ group { name: "elm/popup/content/liststyle";
          scale : 1;
          description { state: "default" 0.0;
             min: POPUP_CONTENT_LISTSTYLE_CONTENT_DEFAULT_MIN_INC;
+            max: POPUP_CONTENT_LISTSTYLE_CONTENT_DEFAULT_MIN_INC;
             align: 0.5 0.5;
             fixed: 1 0;
             rel1 {
@@ -1569,6 +1573,7 @@ group { name: "elm/popup/base/customstyle";
          scale : 1;
          description { state: "default" 0.0;
             min: POPUP_BASE_CUSTOMSTYLE_CONTENT_DEFAULT_MIN_INC;
+            max: POPUP_BASE_CUSTOMSTYLE_CONTENT_DEFAULT_MIN_INC;
             fixed: 1 0;
             rel1 {
                relative: 0.5 0.0;
@@ -2216,6 +2221,7 @@ group { name: "elm/popup/content/volumebarstyle";
          scale : 1;
          description { state: "default" 0.0;
             min: POPUP_CONTENT_VOLUMEBAR_STYLE_CONTENT_DEFAULT_MIN_INC;
+            max: POPUP_CONTENT_VOLUMEBAR_STYLE_CONTENT_DEFAULT_MIN_INC;
             align: 0.5 0.5;
             fixed: 1 0;
             rel1 {
@@ -2542,6 +2548,8 @@ group { name: "elm/popup/base/content_expand";
          type: SWALLOW;
          scale : 1;
          description { state: "default" 0.0;
+            min: POPUP_BASE_DEFAULT_CONTENT_DEFAULT_MIN_MAX_INC;
+            max: POPUP_BASE_DEFAULT_CONTENT_DEFAULT_MIN_MAX_INC;
             rel1.relative: 0.5 0.0;
             rel2.relative: 0.5 1.0;
          }