summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDaniel Hirt <daniel.hirt@samsung.com>2016-03-17 15:10:08 +0200
committerDaniel Hirt <daniel.hirt@samsung.com>2016-04-04 17:33:23 +0300
commitd0b98e6b17d6b1e5375d8e2a2c341e830fedee29 (patch)
treef1c6c4e44bfbc10c6a8a0dbae114d3ff242e89e8
parent44686eb27114b41015c153eafa6e1029fe75fc74 (diff)
downloadefl-d0b98e6b17d6b1e5375d8e2a2c341e830fedee29.tar.gz
Label: Move theming to ctor
Following the previous change in Entry, theming is back to ctor. All calculations are deferred to entry's finalize().
-rw-r--r--src/lib/elementary/elm_label.c15
-rw-r--r--src/lib/elementary/elm_label.eo1
2 files changed, 2 insertions, 14 deletions
diff --git a/src/lib/elementary/elm_label.c b/src/lib/elementary/elm_label.c
index a1400d6e8e..13ab7d75d0 100644
--- a/src/lib/elementary/elm_label.c
+++ b/src/lib/elementary/elm_label.c
@@ -344,21 +344,10 @@ _elm_label_eo_base_constructor(Eo *obj, Elm_Label_Data *_pd EINA_UNUSED)
evas_obj_smart_callbacks_descriptions_set(obj, _smart_callbacks);
elm_interface_atspi_accessible_role_set(obj, ELM_ATSPI_ROLE_LABEL);
- return obj;
-}
-
-EOLIAN static Eo *
-_elm_label_eo_base_finalize(Eo *obj, Elm_Label_Data *_pd EINA_UNUSED)
-{
- /* FIXME: It should be called when eo_add() is called for
- * improving performance. Elm label is singleline and non editable
- * by default. The changing these properties not only change Edje,
- * but also change flags inside of entry.
- * So, we need to call entry APIs for changing its properties. */
- elm_entry_editable_set(obj, EINA_FALSE);
+ if (!elm_layout_theme_set(obj, "entry", "base-noedit", elm_widget_style_get(obj)))
+ CRI("Failed to set layout!");
elm_entry_single_line_set(obj, EINA_TRUE);
- elm_layout_sizing_eval(obj);
return obj;
}
diff --git a/src/lib/elementary/elm_label.eo b/src/lib/elementary/elm_label.eo
index 969bbd2f17..c46bbd3779 100644
--- a/src/lib/elementary/elm_label.eo
+++ b/src/lib/elementary/elm_label.eo
@@ -89,7 +89,6 @@ class Elm.Label (Elm.Entry)
implements {
class.constructor;
Eo.Base.constructor;
- Eo.Base.finalize;
Evas.Object_Smart.add;
Elm.Widget.focus_next_manager_is;
Elm.Widget.focus_direction_manager_is;