forked from enlightenment/efl
[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:
parent
368810690c
commit
d7b9aa66b1
|
@ -1438,6 +1438,10 @@
|
||||||
|
|
||||||
* Fix elm_scroller_page_show bug. It have to save the wanted values to show the wanted page.
|
* 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
|
2013-06-22 Thiep Ha
|
||||||
|
|
||||||
* Move cursor when mouse moves with longpress.
|
* Move cursor when mouse moves with longpress.
|
||||||
|
|
|
@ -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.
|
* 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.
|
* 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 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.
|
* Block mouse events when the ctxpopup on dismiss.
|
||||||
* Fix crash of elm_notify when timeout is zero.
|
* Fix crash of elm_notify when timeout is zero.
|
||||||
* Fix Segfault in elementary file_selector_example when closed
|
* Fix Segfault in elementary file_selector_example when closed
|
||||||
|
|
|
@ -490,6 +490,7 @@ _elm_entry_smart_disable(Eo *obj, void *_pd, va_list *list)
|
||||||
static void
|
static void
|
||||||
_elm_entry_smart_theme(Eo *obj, void *_pd, va_list *list)
|
_elm_entry_smart_theme(Eo *obj, void *_pd, va_list *list)
|
||||||
{
|
{
|
||||||
|
const char *str;
|
||||||
const char *t;
|
const char *t;
|
||||||
Eina_Bool *ret = va_arg(*list, Eina_Bool *);
|
Eina_Bool *ret = va_arg(*list, Eina_Bool *);
|
||||||
if (ret) *ret = EINA_FALSE;
|
if (ret) *ret = EINA_FALSE;
|
||||||
|
@ -556,7 +557,6 @@ _elm_entry_smart_theme(Eo *obj, void *_pd, va_list *list)
|
||||||
|
|
||||||
if (sd->scroll)
|
if (sd->scroll)
|
||||||
{
|
{
|
||||||
const char *str;
|
|
||||||
Eina_Bool ok = EINA_FALSE;
|
Eina_Bool ok = EINA_FALSE;
|
||||||
|
|
||||||
eo_do(obj, elm_scrollable_interface_mirrored_set(elm_widget_mirrored_get(obj)));
|
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));
|
(obj, sd->scr_edje, "scroller", "entry", elm_widget_style_get(obj));
|
||||||
|
|
||||||
str = edje_object_data_get(sd->scr_edje, "focus_highlight");
|
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;
|
sd->changed = EINA_TRUE;
|
||||||
elm_layout_sizing_eval(obj);
|
elm_layout_sizing_eval(obj);
|
||||||
|
|
Loading…
Reference in New Issue