summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJaeun Choi <jaeun12.choi@samsung.com>2017-09-05 17:09:37 +0900
committerJaeun Choi <jaeun12.choi@samsung.com>2017-09-05 17:09:37 +0900
commit61381f6e3584118a70565eea79c355dd049b9e28 (patch)
tree262be69d768e8c6b62d81e2374c6aef665d26a35
parent373e6a09183b4be984ad9220b75bf97da1df8745 (diff)
downloadefl-61381f6e3584118a70565eea79c355dd049b9e28.tar.gz
elm_panel: set content as a sub object of panel object
since sd->bx is not an elm object, it is excluded from parent-child tree. in case of a non-scrollable panel, the content needs to be attached to the tree as a child of panel object directly.
-rw-r--r--src/lib/elementary/elm_panel.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/src/lib/elementary/elm_panel.c b/src/lib/elementary/elm_panel.c
index 71ef02df02..9b2147dc4f 100644
--- a/src/lib/elementary/elm_panel.c
+++ b/src/lib/elementary/elm_panel.c
@@ -796,6 +796,8 @@ _elm_panel_content_set(Eo *obj, Elm_Panel_Data *sd, const char *part, Evas_Objec
evas_object_show(sd->content);
if (sd->scrollable)
elm_widget_sub_object_add(sd->scr_ly, sd->content);
+ else
+ elm_widget_sub_object_add(obj, sd->content);
}
elm_layout_sizing_eval(obj);
@@ -1456,7 +1458,7 @@ _elm_panel_scrollable_set(Eo *obj, Elm_Panel_Data *sd, Eina_Bool scrollable)
elm_layout_content_unset(sd->scr_ly, "elm.swallow.content");
elm_layout_content_set(obj, "elm.swallow.content", sd->bx);
- if (sd->content) elm_widget_sub_object_add(sd->bx, sd->content);
+ if (sd->content) elm_widget_sub_object_add(obj, sd->content);
}
}