summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorYoungbok Shin <youngb.shin@samsung.com>2016-03-22 14:36:13 +0900
committerYoungbok Shin <youngb.shin@samsung.com>2016-03-22 14:36:13 +0900
commitade21280ba2788e046d6adc5d0d9029fd569cc41 (patch)
tree558878e1609199fdb8eacc9418719f5584aa5e2e
parent435d767ef0b44932b770b34f183fcdacdfef109d (diff)
Label: Fix slide style groups
If elm_label's theme apply relies on elm_entry, its theme has to be set by elm_entry. the group name is changed by elm_entry's flags. So, if we have to set non- editable group, we have to use API for changing flags, too.
-rw-r--r--data/themes/edc/elm/entry.edc3
-rw-r--r--src/lib/elm_label.c3
2 files changed, 4 insertions, 2 deletions
diff --git a/data/themes/edc/elm/entry.edc b/data/themes/edc/elm/entry.edc
index 6ac503c20..531a2192d 100644
--- a/data/themes/edc/elm/entry.edc
+++ b/data/themes/edc/elm/entry.edc
@@ -1180,6 +1180,7 @@ group { name: "elm/entry/handler/end/default";
1180 1180
1181group { name: "elm/entry/base/slide_long"; 1181group { name: "elm/entry/base/slide_long";
1182 inherit: "elm/entry/base-noedit/default"; 1182 inherit: "elm/entry/base-noedit/default";
1183 alias: "elm/entry/base-single-noedit/slide_long";
1183 script { 1184 script {
1184 public g_duration, g_stopslide, g_timer_id, g_anim_id; 1185 public g_duration, g_stopslide, g_timer_id, g_anim_id;
1185 1186
@@ -1297,6 +1298,7 @@ group { name: "elm/entry/base/slide_long";
1297 1298
1298group { name: "elm/entry/base/slide_short"; 1299group { name: "elm/entry/base/slide_short";
1299 inherit: "elm/entry/base-noedit/default"; 1300 inherit: "elm/entry/base-noedit/default";
1301 alias: "elm/entry/base-single-noedit/slide_short";
1300 script { 1302 script {
1301 public g_duration, g_stopslide, g_timer_id, g_anim_id; 1303 public g_duration, g_stopslide, g_timer_id, g_anim_id;
1302 1304
@@ -1411,6 +1413,7 @@ group { name: "elm/entry/base/slide_short";
1411 1413
1412group { name: "elm/entry/base/slide_bounce"; 1414group { name: "elm/entry/base/slide_bounce";
1413 inherit: "elm/entry/base-noedit/default"; 1415 inherit: "elm/entry/base-noedit/default";
1416 alias: "elm/entry/base-single-noedit/slide_bounce";
1414 script { 1417 script {
1415 public g_duration, g_stopslide, g_timer_id, g_anim_id; 1418 public g_duration, g_stopslide, g_timer_id, g_anim_id;
1416 1419
diff --git a/src/lib/elm_label.c b/src/lib/elm_label.c
index 610be75a3..fe34dae6d 100644
--- a/src/lib/elm_label.c
+++ b/src/lib/elm_label.c
@@ -325,8 +325,7 @@ _elm_label_eo_base_constructor(Eo *obj, Elm_Label_Data *_pd EINA_UNUSED)
325 evas_obj_smart_callbacks_descriptions_set(obj, _smart_callbacks); 325 evas_obj_smart_callbacks_descriptions_set(obj, _smart_callbacks);
326 elm_interface_atspi_accessible_role_set(obj, ELM_ATSPI_ROLE_LABEL); 326 elm_interface_atspi_accessible_role_set(obj, ELM_ATSPI_ROLE_LABEL);
327 327
328 if (!elm_layout_theme_set(obj, "entry", "base-noedit", elm_widget_style_get(obj))) 328 elm_entry_editable_set(obj, EINA_FALSE);
329 CRI("Failed to set layout!");
330 elm_entry_single_line_set(obj, EINA_TRUE); 329 elm_entry_single_line_set(obj, EINA_TRUE);
331 330
332 return obj; 331 return obj;