enlightenment/enlightenment
enlightenment
/
enlightenment
10
9
Fork 12
Code Issues 25 Pull Requests 2 Projects Releases Wiki Activity

scrollframe now accepts key press events to control it too - use in 

conjunction with propagate for child widgets/objects as to if u want events
to go back to the parent scrollframe or not


SVN revision: 18124
This commit is contained in:
Carsten Haitzler 2005-10-30 05:20:14 +00:00
parent 79c46e0bfd
commit 040ff61b0b
2 changed files with 48 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

45
src/bin/e_scrollframe.c
View File

@ -43,6 +43,7 @@ struct _E_Smart_Data
static void _e_smart_child_del_hook(void *data, Evas *e, Evas_Object *obj, void *event_info);
static void _e_smart_pan_changed_hook(void *data, Evas_Object *obj, void *event_info);
static void _e_smart_event_wheel(void *data, Evas *e, Evas_Object *obj, void *event_info);
static void _e_smart_event_key_down(void *data, Evas *e, Evas_Object *obj, void *event_info);
static void _e_smart_edje_drag_v(void *data, Evas_Object *obj, const char *emission, const char *source);
static void _e_smart_edje_drag_h(void *data, Evas_Object *obj, const char *emission, const char *source);
static void _e_smart_scrollbar_read(E_Smart_Data *sd);
@ -313,6 +314,47 @@ _e_smart_event_wheel(void *data, Evas *e, Evas_Object *obj, void *event_info)
e_scrollframe_child_pos_set(sd->smart_obj, x, y);
}
static void
_e_smart_event_key_down(void *data, Evas *e, Evas_Object *obj, void *event_info)
{
Evas_Event_Key_Down *ev;
E_Smart_Data *sd;
Evas_Coord x = 0, y = 0, vw = 0, vh = 0, mx = 0, my = 0;
sd = data;
ev = event_info;
e_scrollframe_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;
else if (!strcmp(ev->keyname, "Right"))
x += sd->step.x;
else if (!strcmp(ev->keyname, "Up"))
y -= sd->step.y;
else if (!strcmp(ev->keyname, "Home"))
y = 0;
else if (!strcmp(ev->keyname, "End"))
y = my;
else if (!strcmp(ev->keyname, "Down"))
y += sd->step.y;
else if (!strcmp(ev->keyname, "Prior"))
{
if (sd->page.y < 0)
y -= -(sd->page.y * vh) / 100;
else
y -= sd->page.y;
}
else if (!strcmp(ev->keyname, "Next"))
{
if (sd->page.y < 0)
y += -(sd->page.y * vh) / 100;
else
y += sd->page.y;
}
e_scrollframe_child_pos_set(sd->smart_obj, x, y);
}
static void
_e_smart_scrollbar_read(E_Smart_Data *sd)
{
@ -573,6 +615,9 @@ _e_smart_add(Evas_Object *obj)
sd->hbar_visible = 1;
sd->vbar_visible = 1;
evas_object_event_callback_add(obj, EVAS_CALLBACK_KEY_DOWN, _e_smart_event_key_down, sd);
evas_object_propagate_events_set(obj, 0);
o = edje_object_add(evas_object_evas_get(obj));
sd->edje_obj = o;
e_theme_edje_object_set(o, "base/theme/widgets",

3
src/bin/e_test.c
View File

@ -330,6 +330,7 @@ _e_test_internal(E_Container *con)
e_icon_file_set(o, "/home/raster/t.png");
evas_object_event_callback_add(o, EVAS_CALLBACK_MOUSE_DOWN, _e_test_click, NULL);
evas_object_resize(o, 1024, 768);
evas_object_focus_set(o, 1);
evas_object_show(o);
o2 = e_scrollframe_add(dia->win->evas);
@ -348,6 +349,8 @@ _e_test_internal(E_Container *con)
e_dialog_button_add(dia, "OK", NULL, NULL, NULL);
e_win_centered_set(dia->win, 1);
e_dialog_show(dia);
evas_object_focus_set(o, 1);
}
#else
static void