projects
/
platform
/
core
/
uifw
/
inputdelegator.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix issue that remaining black screen when back key is pressed after launch keyboard...
[platform/core/uifw/inputdelegator.git]
/
src
/
MoreOption.cpp
diff --git
a/src/MoreOption.cpp
b/src/MoreOption.cpp
index
6b12f6e
..
5159e0c
100755
(executable)
--- a/
src/MoreOption.cpp
+++ b/
src/MoreOption.cpp
@@
-119,7
+119,10
@@
void MoreOption::SetContentLayout(Evas_Object *content) {
elm_object_part_content_set(more_option_layout, "elm.swallow.content", content);
Elm_Object_Item *nit = NULL;
elm_object_part_content_set(more_option_layout, "elm.swallow.content", content);
Elm_Object_Item *nit = NULL;
- nit = elm_naviframe_item_push(nf, NULL, NULL, NULL, more_option_layout, "empty");
+ const char *item_style = NULL;
+ if (_WEARABLE)
+ item_style = "empty";
+ nit = elm_naviframe_item_push(nf, NULL, NULL, NULL, more_option_layout, item_style);
elm_naviframe_item_title_enabled_set(nit, EINA_FALSE, EINA_FALSE);
elm_naviframe_item_pop_cb_set(nit,
elm_naviframe_item_title_enabled_set(nit, EINA_FALSE, EINA_FALSE);
elm_naviframe_item_pop_cb_set(nit,
@@
-227,6
+230,8
@@
Evas_Object* MoreOption::AddLanguageIcon(Evas_Object *parent) {
string res_path = get_resource_path();
if (_WEARABLE)
res_path = res_path + "wearable/";
string res_path = get_resource_path();
if (_WEARABLE)
res_path = res_path + "wearable/";
+ else if (_TV)
+ res_path = res_path + "tv/";
else
res_path = res_path + "mobile/";
else
res_path = res_path + "mobile/";