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

key events of the scroller treat in event_hook 

Author:    Helen Fornazier <helen.fornazier@profusion.mobi>

The idea of the treatment of the key downs events in the smart scroller
is be equal to any widget that use it. But to do this, the smart
scroller must listen to the EVAS_CALLBACK_KEY_DOWN, this will cause a
problem to list, genlist, gengrid, because the event will arrive first
to the smart scroller then to this widgets (because the widgets are
listening the event by event_hook). So, if the scroller treat "Up", the
genlist will not select the item above because this event was already
treat by the scroller.

Now the tratment of the keys was tranfer to the elm_scroller instead of
els_scroller.

SVN revision: 52962
This commit is contained in:
Tiago Rezende Campos Falcao 2010-10-01 19:03:07 +00:00
parent 6882817852
commit 953aba8c05
2 changed files with 96 additions and 95 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

96
legacy/elementary/src/lib/elm_scroller.c
View File

@ -49,6 +49,10 @@ static void _theme_hook(Evas_Object *obj);
static void _show_region_hook(void *data, Evas_Object *obj);
static void _sizing_eval(Evas_Object *obj);
static void _sub_del(void *data, Evas_Object *obj, void *event_info);
static void _on_focus_hook(void *data, Evas_Object *obj);
static Eina_Bool _event_hook(Evas_Object *obj, Evas_Object *src,
Evas_Callback_Type type, void *event_info);
static const char SIG_SCROLL[] = "scroll";
static const char SIG_SCROLL_ANIM_START[] = "scroll,anim,start";
@ -72,6 +76,96 @@ static const Evas_Smart_Cb_Description _signals[] = {
{NULL, NULL}
};
static Eina_Bool
_event_hook(Evas_Object *obj, Evas_Object *src __UNUSED__, Evas_Callback_Type type, void *event_info)
{
if (type != EVAS_CALLBACK_KEY_DOWN) return EINA_FALSE;
Evas_Event_Key_Down *ev = event_info;
Widget_Data *wd = elm_widget_data_get(obj);
if (!wd) return EINA_FALSE;
if (ev->event_flags & EVAS_EVENT_FLAG_ON_HOLD) return EINA_FALSE;
if (elm_widget_disabled_get(obj)) return EINA_FALSE;
Evas_Coord x = 0;
Evas_Coord y = 0;
Evas_Coord step_x = 0;
Evas_Coord step_y = 0;
Evas_Coord max_x = 0;
Evas_Coord max_y = 0;
Evas_Coord v_w = 0;
Evas_Coord v_h = 0;
Evas_Coord page_x = 0;
Evas_Coord page_y = 0;
elm_smart_scroller_child_pos_get(wd->scr, &x, &y);
elm_smart_scroller_step_size_get(wd->scr, &step_x, &step_y);
elm_smart_scroller_page_size_get(wd->scr, &page_x, &page_y);
elm_smart_scroller_child_viewport_size_get(wd->scr, &v_w, &v_h);
elm_scroller_child_size_get(obj, &max_x, &max_y);
if (!strcmp(ev->keyname, "Left") || !strcmp(ev->keyname, "KP_Left"))
{
x -= step_x;
}
else if (!strcmp(ev->keyname, "Right") || !strcmp(ev->keyname, "KP_Right"))
{
x += step_x;
}
else if (!strcmp(ev->keyname, "Up") || !strcmp(ev->keyname, "KP_Up"))
{
y -= step_y;
}
else if (!strcmp(ev->keyname, "Down") || !strcmp(ev->keyname, "KP_Down"))
{
y += step_y;
}
else if (!strcmp(ev->keyname, "Home"))
{
y = 0;
}
else if (!strcmp(ev->keyname, "End"))
{
y = max_y - v_h;
}
else if (!strcmp(ev->keyname, "Prior"))
{
if (page_y < 0)
y -= -(page_y * v_h) / 100;
else
y -= page_y;
}
else if (!strcmp(ev->keyname, "Next"))
{
if (page_y < 0)
y += -(page_y * v_h) / 100;
else
y += page_y;
}
else return EINA_FALSE;
ev->event_flags |= EVAS_EVENT_FLAG_ON_HOLD;
elm_smart_scroller_child_pos_set(wd->scr, x, y);
return EINA_TRUE;
}
static void
_on_focus_hook(void *data __UNUSED__, Evas_Object *obj)
{
Widget_Data *wd = elm_widget_data_get(obj);
if (!wd) return;
if (elm_widget_focus_get(obj))
{
edje_object_signal_emit(wd->scr, "elm,action,focus", "elm");
evas_object_focus_set(wd->scr, EINA_TRUE);
}
else
{
edje_object_signal_emit(wd->scr, "elm,action,unfocus", "elm");
evas_object_focus_set(wd->scr, EINA_FALSE);
}
}
static void
_del_hook(Evas_Object *obj)
{
@ -358,6 +452,7 @@ elm_scroller_add(Evas_Object *parent)
ELM_SET_WIDTYPE(widtype, "scroller");
elm_widget_type_set(obj, "scroller");
elm_widget_sub_object_add(parent, obj);
elm_widget_on_focus_hook_set(obj, _on_focus_hook, NULL);
elm_widget_data_set(obj, wd);
elm_widget_del_hook_set(obj, _del_hook);
elm_widget_theme_hook_set(obj, _theme_hook);
@ -366,6 +461,7 @@ elm_scroller_add(Evas_Object *parent)
elm_widget_signal_callback_del_hook_set(obj, _signal_callback_del_hook);
elm_widget_focus_cycle_hook_set(obj, _elm_scroller_focus_cycle_hook);
elm_widget_can_focus_set(obj, EINA_TRUE);
elm_widget_event_hook_set(obj, _event_hook);
wd->widget_name = eina_stringshare_add("scroller");
wd->widget_base = eina_stringshare_add("base");

95
legacy/elementary/src/lib/els_scroller.c
View File

@ -110,7 +110,6 @@ static Eina_Bool _smart_momentum_animator(void *data);
static void _smart_event_mouse_up(void *data, Evas *e, Evas_Object *obj, void *event_info);
static Eina_Bool _smart_onhold_animator(void *data);
static void _smart_event_mouse_move(void *data, Evas *e, Evas_Object *obj, void *event_info);
static void _smart_event_key_down(void *data, Evas *e, Evas_Object *obj, void *event_info);
static void _smart_edje_drag_v_start(void *data, Evas_Object *obj, const char *emission, const char *source);
static void _smart_edje_drag_v_stop(void *data, Evas_Object *obj, const char *emission, const char *source);
static void _smart_edje_drag_v(void *data, Evas_Object *obj, const char *emission, const char *source);
@ -1931,98 +1930,6 @@ _smart_event_mouse_move(void *data, Evas *e, Evas_Object *obj __UNUSED__, void *
}
}
static void
_smart_event_key_down(void *data, Evas *e __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info)
{
Evas_Event_Key_Down *ev;
Smart_Data *sd;
Evas_Coord x = 0, y = 0, vw = 0, vh = 0, mx = 0, my = 0;
int xch = 0, ych = 0;
sd = data;
ev = event_info;
if (ev->event_flags & EVAS_EVENT_FLAG_ON_HOLD) return;
elm_smart_scroller_child_pos_get(sd->smart_obj, &x, &y);
sd->pan_func.max_get(sd->pan_obj, &mx, &my);
evas_object_geometry_get(sd->pan_obj, NULL, NULL, &vw, &vh);
if (!strcmp(ev->keyname, "Left"))
{
x -= sd->step.x;
xch = 1;
}
else if (!strcmp(ev->keyname, "Right"))
{
x += sd->step.x;
xch = 1;
}
else if (!strcmp(ev->keyname, "Up"))
{
y -= sd->step.y;
ych = 1;
}
else if (!strcmp(ev->keyname, "Home"))
{
y = 0;
ych = 1;
}
else if (!strcmp(ev->keyname, "End"))
{
y = my;
ych = 1;
}
else if (!strcmp(ev->keyname, "Down"))
{
y += sd->step.y;
ych = 1;
}
else if (!strcmp(ev->keyname, "Prior"))
{
if (sd->page.y < 0)
y -= -(sd->page.y * vh) / 100;
else
y -= sd->page.y;
ych = 1;
}
else if (!strcmp(ev->keyname, "Next"))
{
if (sd->page.y < 0)
y += -(sd->page.y * vh) / 100;
else
y += sd->page.y;
ych = 1;
}
if (xch)
{
if (sd->scrollto.x.animator)
{
ecore_animator_del(sd->scrollto.x.animator);
sd->scrollto.x.animator = NULL;
}
if (sd->down.bounce_x_animator)
{
ecore_animator_del(sd->down.bounce_x_animator);
sd->down.bounce_x_animator = NULL;
sd->bouncemex = 0;
}
}
if (ych)
{
if (sd->scrollto.y.animator)
{
ecore_animator_del(sd->scrollto.y.animator);
sd->scrollto.y.animator = NULL;
}
if (sd->down.bounce_y_animator)
{
ecore_animator_del(sd->down.bounce_y_animator);
sd->down.bounce_y_animator = NULL;
sd->bouncemey = 0;
}
}
elm_smart_scroller_child_pos_set(sd->smart_obj, x, y);
}
static void
_smart_scrollbar_read(Smart_Data *sd)
{
@ -2316,8 +2223,6 @@ _smart_add(Evas_Object *obj)
sd->one_dir_at_a_time = 1;
evas_object_event_callback_add(obj, EVAS_CALLBACK_KEY_DOWN, _smart_event_key_down, sd);
o = edje_object_add(evas_object_evas_get(obj));
evas_object_propagate_events_set(o, 0);
sd->edje_obj = o;