forked from enlightenment/efl
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
This commit is contained in:
parent
1730d95896
commit
039818aec2
|
@ -287,7 +287,7 @@ group { name: "elm/clock/flipampm/default";
|
||||||
}
|
}
|
||||||
|
|
||||||
#define SWALLOW_PART(_NAME, _R1X, _R1Y, _R2X, _R2Y) \
|
#define SWALLOW_PART(_NAME, _R1X, _R1Y, _R2X, _R2Y) \
|
||||||
part { name: _NAME; \
|
part { name: "elm."_NAME; \
|
||||||
type: SWALLOW; \
|
type: SWALLOW; \
|
||||||
description { state: "default" 0.0; \
|
description { state: "default" 0.0; \
|
||||||
rel1.relative: _R1X _R1Y; \
|
rel1.relative: _R1X _R1Y; \
|
||||||
|
|
|
@ -476,8 +476,13 @@ _time_update(Evas_Object *obj, Eina_Bool theme_update)
|
||||||
edje_object_size_min_restricted_calc
|
edje_object_size_min_restricted_calc
|
||||||
(sd->digit[i], &mw, &mh, mw, mh);
|
(sd->digit[i], &mw, &mh, mw, mh);
|
||||||
evas_object_size_hint_min_set(sd->digit[i], mw, mh);
|
evas_object_size_hint_min_set(sd->digit[i], mw, mh);
|
||||||
snprintf(buf, sizeof(buf), "d%i", i);
|
snprintf(buf, sizeof(buf), "elm.d%i", i);
|
||||||
elm_layout_content_set(obj, buf, sd->digit[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]);
|
evas_object_show(sd->digit[i]);
|
||||||
}
|
}
|
||||||
if (sd->am_pm)
|
if (sd->am_pm)
|
||||||
|
@ -509,7 +514,8 @@ _time_update(Evas_Object *obj, Eina_Bool theme_update)
|
||||||
edje_object_size_min_restricted_calc
|
edje_object_size_min_restricted_calc
|
||||||
(sd->am_pm_obj, &mw, &mh, mw, mh);
|
(sd->am_pm_obj, &mw, &mh, mw, mh);
|
||||||
evas_object_size_hint_min_set(sd->am_pm_obj, 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);
|
evas_object_show(sd->am_pm_obj);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue