rvandegrift
/
efl
forked from enlightenment/efl
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

[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.
This commit is contained in:
Youngbok Shin 2013-07-09 18:40:47 +09:00 committed by WooHyun Jung
parent 368810690c
commit d7b9aa66b1
3 changed files with 15 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
legacy/elementary/ChangeLog
View File

@ -1438,6 +1438,10 @@
* Fix elm_scroller_page_show bug. It have to save the wanted values to show the wanted page.
2013-06-20 Youngbok Shin
* Fix non-scrollable entry did not comply focus_highlight data.
2013-06-22 Thiep Ha
* Move cursor when mouse moves with longpress.

1
legacy/elementary/NEWS
View File

@ -255,6 +255,7 @@ Fixes:
* 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.
* In case of scroll in scroll, the child scroller have to bounce if parents don't have a bounce.
* Fix elm_scroller_page_show bug. It have to save the wanted values to show the wanted page.
* Fix non-scrollable entry did not comply focus_highlight data.
* Block mouse events when the ctxpopup on dismiss.
* Fix crash of elm_notify when timeout is zero.
* Fix Segfault in elementary file_selector_example when closed

15
legacy/elementary/src/lib/elm_entry.c
View File

@ -490,6 +490,7 @@ _elm_entry_smart_disable(Eo *obj, void *_pd, va_list *list)
static void
_elm_entry_smart_theme(Eo *obj, void *_pd, va_list *list)
{
const char *str;
const char *t;
Eina_Bool *ret = va_arg(*list, Eina_Bool *);
if (ret) *ret = EINA_FALSE;
@ -556,7 +557,6 @@ _elm_entry_smart_theme(Eo *obj, void *_pd, va_list *list)
if (sd->scroll)
{
const char *str;
Eina_Bool ok = EINA_FALSE;
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)
(obj, sd->scr_edje, "scroller", "entry", elm_widget_style_get(obj));
str = edje_object_data_get(sd->scr_edje, "focus_highlight");
if ((str) && (!strcmp(str, "on")))
elm_widget_highlight_in_theme_set(obj, EINA_TRUE);
else
elm_widget_highlight_in_theme_set(obj, EINA_FALSE);
}
else
{
str = edje_object_data_get(sd->entry_edje, "focus_highlight");
}
if ((str) && (!strcmp(str, "on")))
elm_widget_highlight_in_theme_set(obj, EINA_TRUE);
else
elm_widget_highlight_in_theme_set(obj, EINA_FALSE);
sd->changed = EINA_TRUE;
elm_layout_sizing_eval(obj);