From 6b720ad25ecfcc5ab8f7b7017d025c08748a9543 Mon Sep 17 00:00:00 2001 From: Radek Kintop Date: Thu, 4 May 2017 18:48:48 +0200 Subject: [PATCH] Generic slider code and 2button popup layout updated, to comply with new tv theme Change-Id: I13b6a167c83f787b90c1992c5ac70f65ce60ccfa Signed-off-by: Radek Kintop --- res/view/common/popup_2btns.edc | 1 + src/view/picture/view_picture_slider_generic.c | 18 ++++++++++++++---- 2 files changed, 15 insertions(+), 4 deletions(-) diff --git a/res/view/common/popup_2btns.edc b/res/view/common/popup_2btns.edc index 36363f4..35c9935 100644 --- a/res/view/common/popup_2btns.edc +++ b/res/view/common/popup_2btns.edc @@ -24,6 +24,7 @@ group { description { state, "default" 0.0; visible, 0; + min, 0 220; } } diff --git a/src/view/picture/view_picture_slider_generic.c b/src/view/picture/view_picture_slider_generic.c index 9182660..36eff2b 100644 --- a/src/view/picture/view_picture_slider_generic.c +++ b/src/view/picture/view_picture_slider_generic.c @@ -49,6 +49,7 @@ static Evas_Object *_create(Evas_Object *win, void *data) { struct _priv *priv = NULL; generic_slider_attr *attr = (generic_slider_attr *)data; + Evas_Object *layout = NULL; if (!win || !attr) { _ERR("Invalid parameter."); @@ -67,12 +68,21 @@ static Evas_Object *_create(Evas_Object *win, void *data) free(priv); return NULL; } - - elm_popup_align_set(priv->base, ELM_NOTIFY_ALIGN_FILL, 1.0); + elm_popup_orient_set(priv->base, ELM_POPUP_ORIENT_BOTTOM); elm_object_style_set(priv->base, "function"); - elm_object_part_text_set(priv->base, "title,text", attr->slider_title); - priv->slider = utils_add_slider(priv->base, "default", 50, + layout = elm_layout_add(priv->base); + elm_layout_theme_set(layout, "layout", "popup", "content/function"); + elm_object_part_text_set(layout, "elm.text", attr->slider_title); + + if (!layout) { + _ERR("Adding layout failed."); + free(priv); + return NULL; + } + elm_object_content_set(priv->base, layout); + + priv->slider = utils_add_slider(layout, "default", 50, attr->slider_min_val, attr->slider_max_val, attr->slider_step); if (!priv->slider) { _ERR("Add slider failed."); -- 2.7.4