From ca10bc37f2b73e3d0f94e45287d5b921a49aec6d Mon Sep 17 00:00:00 2001 From: "moon87.park" Date: Mon, 18 Apr 2016 16:37:20 +0900 Subject: [PATCH] [Widget-viewer-sdk] Fixed that Show the window Change-Id: I6572e1d36cea89a4ff6dc1c4aa34e61a24d1d0d8 --- widget_viewer_sdk/data/widget_viewer_sdk.edc | 23 +++++++++-------------- widget_viewer_sdk/src/main.c | 24 ++++++++---------------- 2 files changed, 17 insertions(+), 30 deletions(-) diff --git a/widget_viewer_sdk/data/widget_viewer_sdk.edc b/widget_viewer_sdk/data/widget_viewer_sdk.edc index ac60555..d2c8411 100644 --- a/widget_viewer_sdk/data/widget_viewer_sdk.edc +++ b/widget_viewer_sdk/data/widget_viewer_sdk.edc @@ -1,8 +1,9 @@ collections { + base_scale: 2.3; styles { style { name: "info,text"; - base: "font=Tizen font_size=25 align=left color=#FFFFFF ellipsis=1.0 wrap=char"; + base: "font=Tizen font_size=25 align=left color=#FFFFFF ellipsis=1.0 wrap=mixed"; tag: "br" "\n"; tag: "hilight" "+ font=Tizen:style=Bold"; tag: "b" "+ font=Tizen:style=Bold"; @@ -21,7 +22,7 @@ collections { state: "default" 0.0; rel1 { relative: 0.0 0.0; } rel2 { relative: 1.0 1.0; } - color: 0 0 0 0; + color: 0 0 0 255; } } @@ -40,6 +41,7 @@ collections { name: "widget,info,bg"; type: RECT; mouse_events: 1; + repeat_events: 1; description { state: "default" 0.0; rel1 { relative: 0.0 0.0; } @@ -75,7 +77,7 @@ collections { part { name: "widget,id,name"; clip_to: "widget,info"; - type: TEXT; + type: TEXTBLOCK; mouse_events: 0; description { state: "default" 0.0; @@ -84,7 +86,6 @@ collections { text { style: "info,text"; text: "widget id"; - fit: 1 1; } } } @@ -104,7 +105,6 @@ collections { text { style: "info,text"; text: "widget id"; - fit: 1 1; } } } @@ -112,7 +112,7 @@ collections { part { name: "widget,content,info,name"; clip_to: "widget,info"; - type: TEXT; + type: TEXTBLOCK; mouse_events: 0; description { state: "default" 0.0; @@ -121,7 +121,6 @@ collections { text { style: "info,text"; text: "content info"; - fit: 1 1; } } } @@ -141,7 +140,6 @@ collections { text { style: "info,text"; text: "content info"; - fit: 1 1; } } } @@ -149,7 +147,7 @@ collections { part { name: "widget,title,name"; clip_to: "widget,info"; - type: TEXT; + type: TEXTBLOCK; mouse_events: 0; description { state: "default" 0.0; @@ -158,7 +156,6 @@ collections { text { style: "info,text"; text: "title"; - fit: 1 1; } } } @@ -178,7 +175,6 @@ collections { text { style: "info,text"; text: "Title"; - fit: 1 1; } } } @@ -186,7 +182,7 @@ collections { part { name: "widget,period,name"; clip_to: "widget,info"; - type: TEXT; + type: TEXTBLOCK; mouse_events: 0; description { state: "default" 0.0; @@ -195,7 +191,6 @@ collections { text { style: "info,text"; text: "period"; - fit: 1 1; } } } @@ -215,7 +210,6 @@ collections { text { style: "info,text"; text: "Update period"; - fit: 1 1; } } } @@ -224,6 +218,7 @@ collections { name: "widget,size,list"; clip_to: "widget,info"; mouse_events: 1; + repeat_events: 1; type: SWALLOW; description { state: "default" 0.0; diff --git a/widget_viewer_sdk/src/main.c b/widget_viewer_sdk/src/main.c index 6ba796e..f349393 100644 --- a/widget_viewer_sdk/src/main.c +++ b/widget_viewer_sdk/src/main.c @@ -217,22 +217,13 @@ static bool app_create(void *data) return false; } - evas_object_show(s_info.win); - + elm_app_base_scale_set(2.6); elm_win_screen_size_get(s_info.win, NULL, NULL, &s_info.w, &s_info.h); LOGD("Window: %dx%d\n", s_info.w, s_info.h); - s_info.bg = elm_bg_add(s_info.win); - if (!s_info.bg) { - ErrPrint("Failed to add a BG\n"); - evas_object_del(s_info.win); - s_info.win = NULL; - return false; - } - - elm_win_resize_object_add(s_info.win, s_info.bg); - elm_bg_color_set(s_info.bg, 0, 0, 0); - evas_object_show(s_info.bg); + elm_win_alpha_set(s_info.win, EINA_FALSE); + elm_win_indicator_mode_set(s_info.win, ELM_WIN_INDICATOR_SHOW); + evas_object_show(s_info.win); s_info.box = elm_box_add(s_info.win); if (!s_info.box) { @@ -242,9 +233,9 @@ static bool app_create(void *data) s_info.win = NULL; return false; } - evas_object_size_hint_expand_set(s_info.box, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); - evas_object_size_hint_fill_set(s_info.box, EVAS_HINT_FILL, EVAS_HINT_FILL); - elm_box_align_set(s_info.box, 0.5, 0.5); + evas_object_size_hint_fill_set(s_info.box, 0.0, EVAS_HINT_FILL); + evas_object_size_hint_weight_set(s_info.box, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); + elm_box_align_set(s_info.box, 0.0, 0.0); s_info.layout = elm_layout_add(s_info.win); if (!s_info.layout) { @@ -487,6 +478,7 @@ static int load_widget(const char *widget_id) evas_object_resize(s_info.ctx.widget, w, h); evas_object_size_hint_min_set(s_info.ctx.widget, w, h); evas_object_size_hint_max_set(s_info.ctx.widget, w, h); + evas_object_size_hint_align_set(s_info.ctx.widget, 0.0, 0.5); evas_object_show(s_info.ctx.widget); return WIDGET_ERROR_NONE; -- 2.7.4