timer23
/
efl
forked from enlightenment/efl
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

theme: fix part namespacing in multibuttonentry theme 

Summary:
this was released with improperly namespaced parts which must be maintained
for future releases, but the namespacing can be corrected for future
releases while adding aliasing to preserve compatibility
Depends on D6208

Reviewers: cedric

Reviewed By: cedric

Subscribers: #committers

Tags: #efl

Differential Revision: https://phab.enlightenment.org/D6210
This commit is contained in:
Mike Blumenkrantz 2018-06-19 13:27:49 -04:00
parent 3c7bf82efe
commit 3c094d8146
2 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
data/elementary/themes/edc/elm/multibuttonentry.edc
View File

@ -18,7 +18,9 @@ group { name: "elm/multibuttonentry/base/default";
rel2.to: "bg";
}
}
part { name: "box.swallow"; type: SWALLOW;
/* this widget was released with non-namespaced parts in legacy api */
alias: "box.swallow" "elm.swallow.box";
part { name: "elm.swallow.box"; type: SWALLOW;
description { state: "default" 0.0;
rel1.to: "bg";
rel2.to: "bg";

3
src/lib/elementary/elc_multibuttonentry.c
View File

@ -1432,7 +1432,8 @@ _view_init(Evas_Object *obj, Elm_Multibuttonentry_Data *sd)
elm_box_layout_set(sd->box, _box_layout_cb, obj, NULL);
elm_box_homogeneous_set(sd->box, EINA_FALSE);
elm_layout_content_set(obj, "box.swallow", sd->box);
if (!elm_layout_content_set(obj, "elm.swallow.box", sd->box))
elm_layout_content_set(obj, "box.swallow", sd->box);
sd->label = edje_object_add(evas_object_evas_get(obj));
if (!sd->label) return;