From 039818aec299ca1c58909cd5e5b5fcc759ed43b7 Mon Sep 17 00:00:00 2001 From: Xavi Artigas Date: Fri, 29 Jun 2018 11:49:19 -0400 Subject: [PATCH] default theme: fix part names in elm/clock Summary: Ref T6965 Reviewers: devilhorns, zmike Reviewed By: zmike Subscribers: cedric, #committers, zmike Tags: #efl Maniphest Tasks: T6965 Differential Revision: https://phab.enlightenment.org/D6452 --- data/elementary/themes/edc/elm/clock.edc | 2 +- src/lib/elementary/elm_clock.c | 12 +++++++++--- 2 files changed, 10 insertions(+), 4 deletions(-) diff --git a/data/elementary/themes/edc/elm/clock.edc b/data/elementary/themes/edc/elm/clock.edc index f3bbd44167..43072a65d1 100644 --- a/data/elementary/themes/edc/elm/clock.edc +++ b/data/elementary/themes/edc/elm/clock.edc @@ -287,7 +287,7 @@ group { name: "elm/clock/flipampm/default"; } #define SWALLOW_PART(_NAME, _R1X, _R1Y, _R2X, _R2Y) \ - part { name: _NAME; \ + part { name: "elm."_NAME; \ type: SWALLOW; \ description { state: "default" 0.0; \ rel1.relative: _R1X _R1Y; \ diff --git a/src/lib/elementary/elm_clock.c b/src/lib/elementary/elm_clock.c index 39ab38e515..db851796f7 100644 --- a/src/lib/elementary/elm_clock.c +++ b/src/lib/elementary/elm_clock.c @@ -476,8 +476,13 @@ _time_update(Evas_Object *obj, Eina_Bool theme_update) edje_object_size_min_restricted_calc (sd->digit[i], &mw, &mh, mw, mh); evas_object_size_hint_min_set(sd->digit[i], mw, mh); - snprintf(buf, sizeof(buf), "d%i", i); - elm_layout_content_set(obj, buf, sd->digit[i]); + snprintf(buf, sizeof(buf), "elm.d%i", i); + if (!elm_layout_content_set(obj, buf, sd->digit[i])) + { + // Previous versions of the theme did not have the namespace + snprintf(buf, sizeof(buf), "d%i", i); + elm_layout_content_set(obj, buf, sd->digit[i]); + } evas_object_show(sd->digit[i]); } if (sd->am_pm) @@ -509,7 +514,8 @@ _time_update(Evas_Object *obj, Eina_Bool theme_update) edje_object_size_min_restricted_calc (sd->am_pm_obj, &mw, &mh, mw, mh); evas_object_size_hint_min_set(sd->am_pm_obj, mw, mh); - elm_layout_content_set(obj, "ampm", sd->am_pm_obj); + if (!elm_layout_content_set(obj, "elm.ampm", sd->am_pm_obj)) + elm_layout_content_set(obj, "ampm", sd->am_pm_obj); evas_object_show(sd->am_pm_obj); }