From 9d25d801e66eecd836aa0a37b4e7d34845d38314 Mon Sep 17 00:00:00 2001 From: Gustavo Lima Chaves Date: Wed, 4 Jul 2012 21:36:50 +0000 Subject: [PATCH] [elm] These intricate scrolling hooks will be the last to be evaluated. Porting of the basic scrolling infra to an interface will happenfirst, as well as the scrolling widgets porting. Patch by: Gustavo Lima Chaves SVN revision: 73306 --- legacy/elementary/src/lib/elm_widget.c | 11 +++-------- legacy/elementary/src/lib/elm_widget.h | 8 +++++++- 2 files changed, 10 insertions(+), 9 deletions(-) diff --git a/legacy/elementary/src/lib/elm_widget.c b/legacy/elementary/src/lib/elm_widget.c index 57b94dbcce..ad17961682 100644 --- a/legacy/elementary/src/lib/elm_widget.c +++ b/legacy/elementary/src/lib/elm_widget.c @@ -114,11 +114,6 @@ typedef struct _Elm_Widget_Compat_Smart_Data Evas_Object *obj); void (*on_change)(void *data, Evas_Object *obj); - void (*focus_region)(Evas_Object *obj, - Evas_Coord x, - Evas_Coord y, - Evas_Coord w, - Evas_Coord h); void (*on_focus_region)(const Evas_Object *obj, Evas_Coord *x, Evas_Coord *y, @@ -887,9 +882,9 @@ _elm_widget_focus_region_show(const Evas_Object *obj) { Evas_Coord px, py; sd2 = evas_object_smart_data_get(o); - if (_elm_legacy_is(o) && COMPAT_SMART_DATA(sd2)->focus_region) + if (_elm_legacy_is(o) && sd2->focus_region) { - COMPAT_SMART_DATA(sd2)->focus_region(o, x, y, w, h); + sd2->focus_region(o, x, y, w, h); elm_widget_focus_region_get(o, &x, &y, &w, &h); } else @@ -1479,7 +1474,7 @@ elm_widget_focus_region_hook_set(Evas_Object *obj, { API_ENTRY return; - COMPAT_SMART_DATA(sd)->focus_region = func; + sd->focus_region = func; } /** diff --git a/legacy/elementary/src/lib/elm_widget.h b/legacy/elementary/src/lib/elm_widget.h index c85109a631..c3844071f6 100644 --- a/legacy/elementary/src/lib/elm_widget.h +++ b/legacy/elementary/src/lib/elm_widget.h @@ -465,10 +465,16 @@ typedef struct _Elm_Widget_Smart_Data Eina_List *focus_chain; Eina_List *event_cb; - /* subject to later analysis: to be changed by something different */ + /* this block is subject to later analysis: to be changed by + * something different */ void *on_show_region_data; void (*on_show_region)(void *data, Evas_Object *obj); + void (*focus_region)(Evas_Object *obj, + Evas_Coord x, + Evas_Coord y, + Evas_Coord w, + Evas_Coord h); Eina_Bool drag_x_locked : 1; Eina_Bool drag_y_locked : 1;