[popup] Title have variable font size and ellipsis.

Change-Id: Id4bbb9839b8bdf7adaf42a22d240207b16473cbc

diff --git a/themes/inc/tizen-hd-inc.edc b/themes/inc/tizen-hd-inc.edc
index bd87702..5b86718 100644 (file)
--- a/themes/inc/tizen-hd-inc.edc
+++ b/themes/inc/tizen-hd-inc.edc
@@ -838,6 +838,7 @@
 #define POPUP_DIM_BG_CLICKED_TRANS_COLOR_INC 0 0 0 50
 
 
+#define POPUP_BASE_DEFAULT_TEXT_MIN_FONT_SIZE_INC 42
 #define POPUP_BASE_DEFAULT_TEXT_FONT_SIZE_INC 50
 #define POPUP_DESCRIPTION_DEFAULT_TEXT_FONT_SIZE_INC 38
 
@@ -849,7 +850,7 @@
 #define POPUP_BASE_DEFAULT_TITLE_DEFAULT_MIN_INC 630 80
 #define POPUP_BASE_DEFAULT_TITLE_LANDSCAPE_MIN_INC 810 80
 #define POPUP_BASE_DEFAULT_TITLE_VOLUMEBAR_MIN_INC 648 68
-#define POPUP_BASE_DEFAULT_PADDING_MIN_MAX_INC 30 0
+#define POPUP_BASE_DEFAULT_PADDING_MIN_MAX_INC 30 10
 #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

diff --git a/themes/widgets/popup.edc b/themes/widgets/popup.edc
index 7b5837f..a08a731 100644 (file)
--- a/themes/widgets/popup.edc
+++ b/themes/widgets/popup.edc
@@ -368,7 +368,7 @@ group { name: "elm/popup/base/default";
    }
    styles {
       style { name: "popup_title_style";
-         base: "font=Tizen:style=Medium font_size="POPUP_BASE_DEFAULT_TEXT_FONT_SIZE_INC" align=left color="POPUP_DEFAULT_TITLE_TEXT_COLOR_INC" style="POPUP_DEFAULT_TITLE_TEXT_SHADOW_STYLE" shadow_color="POPUP_DEFAULT_TITLE_TEXT_SHADOW_COLOR" wrap=mixed ellipsis=0.0 text_class=tizen";
+         base: "font=Tizen:style=Medium align=left font_size="POPUP_BASE_DEFAULT_TEXT_FONT_SIZE_INC" color="POPUP_DEFAULT_TITLE_TEXT_COLOR_INC" style="POPUP_DEFAULT_TITLE_TEXT_SHADOW_STYLE" shadow_color="POPUP_DEFAULT_TITLE_TEXT_SHADOW_COLOR" wrap=mixed ellipsis=1.0 text_class=tizen";
          tag:  "br" "\n";
          tag:  "tab" "\t";
       }
@@ -579,6 +579,10 @@ group { name: "elm/popup/base/default";
             fixed: 1 1;
             text {
               style: "popup_title_style";
+              size: POPUP_BASE_DEFAULT_TEXT_FONT_SIZE_INC;
+              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 {
@@ -2050,13 +2054,15 @@ group { name: "elm/popup/base/content_expand";
          description { state: "default" 0.0;
             text {
               style: "popup_title_style";
-              min: 0 0;
-              max: 0 1;
-              align: 0.5 0.0;
+              size: POPUP_BASE_DEFAULT_TEXT_FONT_SIZE_INC;
+              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;
+            visible: 0;
             rel1 {
-               relative: 1.0 0.0;
+               relative: 1.0 1.0;
                to: "left_pad";
             }
             rel2 {