[TIZENIOT-2103] Fixed Subtitle Preview text alignment

Change-Id: I313c6507abb35cc88f932eb29bf139d31b06e986
Signed-off-by: aman.jeph <aman.jeph@samsung.com>

diff --git a/playview/src/feature/vp-subtitle.c b/playview/src/feature/vp-subtitle.c
index 1cc79d8bd62f376f28c7624f5e9a31fe43c816c2..0a859655ba49f15798f51a9510c8733f71db3c6c 100755 (executable)
--- a/playview/src/feature/vp-subtitle.c
+++ b/playview/src/feature/vp-subtitle.c
@@ -38,7 +38,7 @@
 */
 
 #define VP_SUBTITLE_GENLIST_DATA_KEY           "vp.subtitle.genlist"
-#define VP_SUBTITLE_TXT_FORMAT "<font_size= %d><align=center><style=%s><font='%s' font_weight=%s color=%s backing_color=%s backing=%s align=%s>%s</font></style></font_size>"
+#define VP_SUBTITLE_TXT_FORMAT "<font_size= %d><align=%s><color=%s backing_color=%s backing=%s>%s</font_size></align>"
 #define        VP_SUBTITLE_COLOR_LEN   7
 #define VP_SUBTITLE_SET_CAPTION_WINDOW_PREVIEW_COLOR_ID                1
 
@@ -203,10 +203,8 @@ static char *_vp_play_subtitle_text_get(SubtitleInfo * pSubtitleInfo,
                szAlignment = g_strdup_printf("right");
        }
 #endif
-       szTxtFormat =
-               g_strdup_printf(VP_SUBTITLE_TXT_FORMAT, nSize, szFontEdge,
-                                               pSubtitleInfo->szFontName, szFontWeight, szColor,
-                                               szBGColor, szBGColorOn, szAlignment, szOutput);
+       szTxtFormat = g_strdup_printf(VP_SUBTITLE_TXT_FORMAT, nSize, szAlignment, szColor,
+                                                               szBGColor, szBGColorOn, szOutput);
 
        VP_FREE(szBGColor);
        VP_FREE(szBGColorOn);

diff --git a/vp-main/res/edje/pv-subtitle-settings.edc b/vp-main/res/edje/pv-subtitle-settings.edc
index e0610bfec4b68d85c72f611dd63b75455cf8e49b..141b11fcefc9011932f459a4db25272728f00d85 100755 (executable)
--- a/vp-main/res/edje/pv-subtitle-settings.edc
+++ b/vp-main/res/edje/pv-subtitle-settings.edc
@@ -41,7 +41,7 @@ collections {
                        base: "font=Tizen:weight=Regular:width=BreezeSans font_size=18 align=center color=#C3CAD2 color_class=title_content/button/text_dim ellipsis=1.0 wrap=none text_class=tizen";
                }
                style { name:"settings_captions";
-                       base: "font=Tizen:weight=Regular:width=BreezeSans font_size=22 align=center color=#FFFFFF ellipsis=1.0 wrap=none text_class=tizen";
+                       base: "font=Tizen:weight=Regular:width=BreezeSans font_size=22 align=center valign=center color=#FFFFFF ellipsis=1.0 wrap=none text_class=tizen";
                }
                style { name:"settings_captions_dim";
                        base: "font=Tizen:weight=Normal:width=BreezeSans font_size=22 align=center color=#C3CAD2 ellipsis=1.0 wrap=none text_class=tizen";
@@ -311,8 +311,8 @@ collections {
                        }
                        image { "caption_bg"; nomouse; scale;
                                desc { "default";
-                                       min: 0 30;
-                                       max: -1 30;
+                                       min: 0 36;
+                                       max: -1 36;
                                        align: 0.0 0.5;
                                        rel1 { to_x:"caption_area_left_padding"; to_y: "caption_area"; relative: 1.0 0.0; }
                                        rel2 { to_x: "caption_area_right_padding"; to_y: "caption_area"; relative: 0.0 1.0; }
@@ -324,9 +324,8 @@ collections {
                                        min: 0 26;
                                        rel.to: "caption_bg";
                                        text {
-                                               text: "This is how caption look like";
+                                               text: "Subtitles will look like this.";
                                                style: "settings_captions";
-                                               min: 1 0;
                                        }
                                        vis;
                                }