summaryrefslogtreecommitdiff
path: root/legacy
diff options
context:
space:
mode:
authorYoungbok Shin <youngb.shin@samsung.com>2013-07-09 18:40:47 +0900
committerWooHyun Jung <wh0705.jung@samsung.com>2013-07-09 18:47:45 +0900
commitd7b9aa66b1ed974c95f4311db89d203da67a8c4e (patch)
treef0215839fdc9b3ec866eb8f0bf4f10e693059b34 /legacy
parent368810690c1ddb4729977dfce4a467cf5c9ac018 (diff)
[entry] Fix non-scrollable entry did not comply focus_highlight data.
elm_entry checked focus_highlight data only if entry is scrollable. Now elm_entry will check focus_highlight data on any style of entries.
Diffstat (limited to 'legacy')
-rw-r--r--legacy/elementary/ChangeLog4
-rw-r--r--legacy/elementary/NEWS1
-rw-r--r--legacy/elementary/src/lib/elm_entry.c15
3 files changed, 15 insertions, 5 deletions
diff --git a/legacy/elementary/ChangeLog b/legacy/elementary/ChangeLog
index 481a6c1de8..881226dcf7 100644
--- a/legacy/elementary/ChangeLog
+++ b/legacy/elementary/ChangeLog
@@ -1438,6 +1438,10 @@
1438 1438
1439 * Fix elm_scroller_page_show bug. It have to save the wanted values to show the wanted page. 1439 * Fix elm_scroller_page_show bug. It have to save the wanted values to show the wanted page.
1440 1440
14412013-06-20 Youngbok Shin
1442
1443 * Fix non-scrollable entry did not comply focus_highlight data.
1444
14412013-06-22 Thiep Ha 14452013-06-22 Thiep Ha
1442 1446
1443 * Move cursor when mouse moves with longpress. 1447 * Move cursor when mouse moves with longpress.
diff --git a/legacy/elementary/NEWS b/legacy/elementary/NEWS
index 235910b2d3..72ff2bff51 100644
--- a/legacy/elementary/NEWS
+++ b/legacy/elementary/NEWS
@@ -255,6 +255,7 @@ Fixes:
255 * Keep the smart members of the naviframe views whenever resize object is changed. This prevents the dangling view objects of the naviframe and keep the layer consistency. 255 * Keep the smart members of the naviframe views whenever resize object is changed. This prevents the dangling view objects of the naviframe and keep the layer consistency.
256 * In case of scroll in scroll, the child scroller have to bounce if parents don't have a bounce. 256 * In case of scroll in scroll, the child scroller have to bounce if parents don't have a bounce.
257 * Fix elm_scroller_page_show bug. It have to save the wanted values to show the wanted page. 257 * Fix elm_scroller_page_show bug. It have to save the wanted values to show the wanted page.
258 * Fix non-scrollable entry did not comply focus_highlight data.
258 * Block mouse events when the ctxpopup on dismiss. 259 * Block mouse events when the ctxpopup on dismiss.
259 * Fix crash of elm_notify when timeout is zero. 260 * Fix crash of elm_notify when timeout is zero.
260 * Fix Segfault in elementary file_selector_example when closed 261 * Fix Segfault in elementary file_selector_example when closed
diff --git a/legacy/elementary/src/lib/elm_entry.c b/legacy/elementary/src/lib/elm_entry.c
index 5509c2a852..d937d12359 100644
--- a/legacy/elementary/src/lib/elm_entry.c
+++ b/legacy/elementary/src/lib/elm_entry.c
@@ -490,6 +490,7 @@ _elm_entry_smart_disable(Eo *obj, void *_pd, va_list *list)
490static void 490static void
491_elm_entry_smart_theme(Eo *obj, void *_pd, va_list *list) 491_elm_entry_smart_theme(Eo *obj, void *_pd, va_list *list)
492{ 492{
493 const char *str;
493 const char *t; 494 const char *t;
494 Eina_Bool *ret = va_arg(*list, Eina_Bool *); 495 Eina_Bool *ret = va_arg(*list, Eina_Bool *);
495 if (ret) *ret = EINA_FALSE; 496 if (ret) *ret = EINA_FALSE;
@@ -556,7 +557,6 @@ _elm_entry_smart_theme(Eo *obj, void *_pd, va_list *list)
556 557
557 if (sd->scroll) 558 if (sd->scroll)
558 { 559 {
559 const char *str;
560 Eina_Bool ok = EINA_FALSE; 560 Eina_Bool ok = EINA_FALSE;
561 561
562 eo_do(obj, elm_scrollable_interface_mirrored_set(elm_widget_mirrored_get(obj))); 562 eo_do(obj, elm_scrollable_interface_mirrored_set(elm_widget_mirrored_get(obj)));
@@ -569,11 +569,16 @@ _elm_entry_smart_theme(Eo *obj, void *_pd, va_list *list)
569 (obj, sd->scr_edje, "scroller", "entry", elm_widget_style_get(obj)); 569 (obj, sd->scr_edje, "scroller", "entry", elm_widget_style_get(obj));
570 570
571 str = edje_object_data_get(sd->scr_edje, "focus_highlight"); 571 str = edje_object_data_get(sd->scr_edje, "focus_highlight");
572 if ((str) && (!strcmp(str, "on")))
573 elm_widget_highlight_in_theme_set(obj, EINA_TRUE);
574 else
575 elm_widget_highlight_in_theme_set(obj, EINA_FALSE);
576 } 572 }
573 else
574 {
575 str = edje_object_data_get(sd->entry_edje, "focus_highlight");
576 }
577
578 if ((str) && (!strcmp(str, "on")))
579 elm_widget_highlight_in_theme_set(obj, EINA_TRUE);
580 else
581 elm_widget_highlight_in_theme_set(obj, EINA_FALSE);
577 582
578 sd->changed = EINA_TRUE; 583 sd->changed = EINA_TRUE;
579 elm_layout_sizing_eval(obj); 584 elm_layout_sizing_eval(obj);