From f999fc3777073791b370d7300539814ed01996b5 Mon Sep 17 00:00:00 2001 From: Gustavo Lima Chaves Date: Thu, 30 Aug 2012 16:47:23 +0000 Subject: [PATCH] [elm] Keeping the on_show_region hook, as this is hard to unhookify. SVN revision: 75905 --- legacy/elementary/src/lib/elm_entry.c | 3 +-- legacy/elementary/src/lib/elm_widget.h | 13 +++++++++++-- 2 files changed, 12 insertions(+), 4 deletions(-) diff --git a/legacy/elementary/src/lib/elm_entry.c b/legacy/elementary/src/lib/elm_entry.c index 177079e6c6..f1a6f4f021 100644 --- a/legacy/elementary/src/lib/elm_entry.c +++ b/legacy/elementary/src/lib/elm_entry.c @@ -888,8 +888,7 @@ _show_region_hook(void *data, elm_widget_show_region_get(obj, &x, &y, &w, &h); - if (sd->scroll) - sd->s_iface->content_region_show(obj, x, y, w, h); + sd->s_iface->content_region_show(obj, x, y, w, h); } static Eina_Bool diff --git a/legacy/elementary/src/lib/elm_widget.h b/legacy/elementary/src/lib/elm_widget.h index 0a90cd4416..64e5befc26 100644 --- a/legacy/elementary/src/lib/elm_widget.h +++ b/legacy/elementary/src/lib/elm_widget.h @@ -480,9 +480,17 @@ typedef struct _Elm_Widget_Smart_Data Evas_Object *hover_obj; Eina_List *tooltips, *cursors; + /* "show region" coordinates. all widgets got those because this + * info may be set and queried recursively through the widget + * parenting tree */ Evas_Coord rx, ry, rw, rh; + + /* scrolling hold/freeze hints. all widgets got those because this + * info may be set and queried recursively through the widget + * parenting tree */ int scroll_hold; int scroll_freeze; + double scale; Elm_Theme *theme; const char *style; @@ -497,8 +505,9 @@ typedef struct _Elm_Widget_Smart_Data Eina_List *focus_chain; Eina_List *event_cb; - /* this block is subject to later analysis: to be changed by - * something different */ + /* this is a hook to be set on-the-fly on widgets. this is code + * handling the request of showing a specific region from an inner + * widget (mainly issued by entries, on cursor moving) */ void *on_show_region_data; void (*on_show_region)(void *data, Evas_Object *obj);