summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorHosang Kim <hosang12.kim@samsung.com>2016-12-16 19:06:39 +0900
committerJEONGHYUN YUN <jh0506.yun@samsung.com>2016-12-29 19:39:04 +0900
commit18d422482e28186f517412dc72100c6d803cdc6b (patch)
treea7c2be7b2baf5530a74599807b8c1161ffba97ba
parent377d6405f407e6a447b40dedc94ceb70b838cbe5 (diff)
downloadefl-theme-tizen-mobile-18d422482e28186f517412dc72100c6d803cdc6b.tar.gz
efl-theme-tizen-mobile-18d422482e28186f517412dc72100c6d803cdc6b.tar.bz2
efl-theme-tizen-mobile-18d422482e28186f517412dc72100c6d803cdc6b.zip
slider: Fix text size to following GUI.
Change-Id: I9c05b8ac91395f997ea988069c5ad6637a441410
-rw-r--r--mobile/HD-inc.edc2
-rw-r--r--mobile/widgets/slider.edc15
2 files changed, 10 insertions, 7 deletions
diff --git a/mobile/HD-inc.edc b/mobile/HD-inc.edc
index cd1a1d64..5bda7c43 100644
--- a/mobile/HD-inc.edc
+++ b/mobile/HD-inc.edc
@@ -536,7 +536,7 @@
#define SLIDER_INDICATOR_PADDING_TOP 20
#define SLIDER_INDICATOR_PADDING_BOTTOM 32
#define SLIDER_INDICATOR_TEXT_SIZE_HEIGHT 48
-#define SLIDER_INDICATOR_TEXT_SIZE_WIDTH 20
+#define SLIDER_INDICATOR_TEXT_SIZE_WIDTH 62
#define SLIDER_VERTICAL_INDICATOR_SIZE_INC 20
#define SLIDER_LEFT_VERTICAL_INDICATOR_SIZE_INC 20
diff --git a/mobile/widgets/slider.edc b/mobile/widgets/slider.edc
index 1dcb224e..33af7771 100644
--- a/mobile/widgets/slider.edc
+++ b/mobile/widgets/slider.edc
@@ -2979,15 +2979,16 @@ group { "elm/slider/horizontal/popup/default";
fixed: 1 1;
hid;
min: SLIDER_INDICATOR_TEXT_SIZE_WIDTH SLIDER_INDICATOR_TEXT_SIZE_HEIGHT;
- max: -1 SLIDER_INDICATOR_TEXT_SIZE_HEIGHT;
+ max: SLIDER_INDICATOR_TEXT_SIZE_WIDTH SLIDER_INDICATOR_TEXT_SIZE_HEIGHT;
color_class: "slider/default/text";
align: 0.5 0.0;
rel1.to: "handler_top";
rel2.to: "handler_top";
rel1.offset: 0 12;
text {
- min: 0 1;
font: "Tizen:weight=Light"; size: "36";
+ size_range: 26 36;
+ fit: 1 0;
text_class: "tizen";
}
}
@@ -3285,15 +3286,16 @@ group { "elm/slider/horizontal/popup/center_point";
fixed: 1 1;
hid;
min: SLIDER_INDICATOR_TEXT_SIZE_WIDTH SLIDER_INDICATOR_TEXT_SIZE_HEIGHT;
- max: -1 SLIDER_INDICATOR_TEXT_SIZE_HEIGHT;
+ max: SLIDER_INDICATOR_TEXT_SIZE_WIDTH SLIDER_INDICATOR_TEXT_SIZE_HEIGHT;
color_class: "slider/center_point/text";
align: 0.5 0.0;
rel1.to: "handler_top";
rel2.to: "handler_top";
rel1.offset: 0 12;
text {
- min: 0 1;
font: "Tizen:weight=Light"; size: "36";
+ size_range: 26 36;
+ fit: 1 0;
text_class: "tizen";
}
}
@@ -3445,15 +3447,16 @@ group { "elm/slider/horizontal/popup/warning";
fixed: 1 1;
hid;
min: SLIDER_INDICATOR_TEXT_SIZE_WIDTH SLIDER_INDICATOR_TEXT_SIZE_HEIGHT;
- max: -1 SLIDER_INDICATOR_TEXT_SIZE_HEIGHT;
+ max: SLIDER_INDICATOR_TEXT_SIZE_WIDTH SLIDER_INDICATOR_TEXT_SIZE_HEIGHT;
color_class: "slider/warning/text";
align: 0.5 0.0;
rel1.to: "handler_top";
rel2.to: "handler_top";
rel1.offset: 0 12;
text {
- min: 0 1;
font: "Tizen:weight=Light"; size: "36";
+ size_range: 26 36;
+ fit: 1 0;
text_class: "tizen";
}
}