[elm] Some oopsies--.

SVN revision: 74405
This commit is contained in:
Gustavo Lima Chaves 2012-07-25 22:03:07 +00:00
parent 7bf179679d
commit 7d1ffe6195
4 changed files with 9 additions and 19 deletions

View File

@ -2426,6 +2426,10 @@ _elm_gengrid_smart_set_user(Elm_Layout_Smart_Class *sc)
ELM_WIDGET_CLASS(sc)->theme = _elm_gengrid_smart_theme;
ELM_WIDGET_CLASS(sc)->event = _elm_gengrid_smart_event;
/* not a 'focus chain manager' */
ELM_WIDGET_CLASS(sc)->focus_next = NULL;
ELM_WIDGET_CLASS(sc)->focus_direction = NULL;
ELM_LAYOUT_CLASS(sc)->sizing_eval = _elm_gengrid_smart_sizing_eval;
}

View File

@ -4819,6 +4819,10 @@ _elm_genlist_smart_set_user(Elm_Layout_Smart_Class *sc)
ELM_WIDGET_CLASS(sc)->event = _elm_genlist_smart_event;
ELM_WIDGET_CLASS(sc)->translate = _elm_genlist_smart_translate;
/* not a 'focus chain manager' */
ELM_WIDGET_CLASS(sc)->focus_next = NULL;
ELM_WIDGET_CLASS(sc)->focus_direction = NULL;
ELM_LAYOUT_CLASS(sc)->sizing_eval = _elm_genlist_smart_sizing_eval;
}

View File

@ -843,7 +843,6 @@ static Eina_Bool
_elm_list_smart_theme(Evas_Object *obj)
{
Elm_List_Item *it;
const char *str;
Eina_List *n;
ELM_LIST_DATA_GET(obj, sd);
@ -852,13 +851,6 @@ _elm_list_smart_theme(Evas_Object *obj)
_mirrored_set(obj, elm_widget_mirrored_get(obj));
str = edje_object_data_get
(ELM_WIDGET_DATA(sd)->resize_obj, "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);
EINA_LIST_FOREACH (sd->items, n, it)
{
edje_object_scale_set
@ -1731,6 +1723,7 @@ _elm_list_smart_set_user(Elm_Layout_Smart_Class *sc)
ELM_WIDGET_CLASS(sc)->sub_object_del = _elm_list_smart_sub_object_del;
ELM_WIDGET_CLASS(sc)->on_focus = _elm_list_smart_on_focus;
ELM_WIDGET_CLASS(sc)->focus_next = _elm_list_smart_focus_next;
ELM_WIDGET_CLASS(sc)->focus_direction = NULL;
ELM_WIDGET_CLASS(sc)->theme = _elm_list_smart_theme;
ELM_WIDGET_CLASS(sc)->disable = _elm_list_smart_disable;
ELM_WIDGET_CLASS(sc)->event = _elm_list_smart_event;

View File

@ -362,22 +362,11 @@ _mirrored_set(Evas_Object *obj,
static Eina_Bool
_elm_scroller_smart_theme(Evas_Object *obj)
{
const char *str;
ELM_SCROLLER_DATA_GET(obj, sd);
if (!ELM_WIDGET_CLASS(_elm_scroller_parent_sc)->theme(obj))
return EINA_FALSE;
_mirrored_set(obj, elm_widget_mirrored_get(obj));
str = edje_object_data_get
(ELM_WIDGET_DATA(sd)->resize_obj, "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);
elm_layout_sizing_eval(obj);
return EINA_TRUE;