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

scroller: Fix wheel scroll with imbricated H+V scrollers 

Test scenario:
 elementary_test -to "Scroller 2"

Use the mouse wheel to scroll inside the horizontal scroller
(the one with many "...Horizontal scrolling..." buttons). This
scroller should scroll horizontally. When reaching the end of
this scroller, the main vertical scroller should take over
and scroll vertically, but only after a 0.5s timeout has passed.

Before this patch, you could wait forever and scrolling inside
the horizontal scroller would never trigger a scroll in the main
vertical scroller, despite reaching the end point.

In 1.18 both the main and the horizontal scrollers scroll
simultaneously. The imbricated vertical scrollers seem to work
as designed, but not H inside V.

@fix
This commit is contained in:
Jean-Philippe Andre 2017-04-12 11:31:21 +09:00
parent 20e7f661e6
commit bc4f803d37
1 changed files with 20 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
src/lib/elementary/elm_interface_scrollable.c
View File

@ -1894,16 +1894,20 @@ _scroll_wheel_post_event_cb(void *data, Evas *e EINA_UNUSED)
Evas_Coord x = 0, y = 0, vw = 0, vh = 0, cw = 0, ch = 0;
int pagenumber_h = 0, pagenumber_v = 0;
int mx = 0, my = 0, minx = 0, miny = 0;
Eina_Bool hold = EINA_FALSE;
Evas_Coord pwx, pwy;
double t;
int direction;
EINA_SAFETY_ON_NULL_RETURN_VAL(ev, EINA_TRUE);
sid->event_info = NULL;
direction = ev->direction;
pwx = sid->wx;
pwy = sid->wy;
if (ev->event_flags & EVAS_EVENT_FLAG_ON_HOLD) return EINA_TRUE;
if (ev->event_flags & EVAS_EVENT_FLAG_ON_HOLD) return EINA_FALSE;
if (evas_key_modifier_is_set(ev->modifiers, "Shift"))
direction = !direction;
@ -1960,12 +1964,20 @@ _scroll_wheel_post_event_cb(void *data, Evas *e EINA_UNUSED)
if (!direction)
{
if ((ch > vh) || (cw <= vw)) y += d * sid->step.y;
else x += d * sid->step.x;
else
{
x += d * sid->step.x;
direction = 1;
}
}
else if (direction == 1)
else
{
if ((cw > vw) || (ch <= vh)) x += d * sid->step.x;
else y += d * sid->step.y;
else
{
y += d * sid->step.y;
direction = 0;
}
}
if ((!sid->hold) && (!sid->freeze))
@ -1990,7 +2002,7 @@ _scroll_wheel_post_event_cb(void *data, Evas *e EINA_UNUSED)
else
x = (pagenumber_h + (1 * ev->z)) * sid->pagesize_h;
}
else if (direction == 1)
else
{
if (cw > vw || ch <= vh)
x = (pagenumber_h + (1 * ev->z)) * sid->pagesize_h;
@ -2012,8 +2024,8 @@ _scroll_wheel_post_event_cb(void *data, Evas *e EINA_UNUSED)
(((t - sid->down.last_time_x_wheel) < 0.5) &&
(sid->down.last_hold_x_wheel)))
{
ev->event_flags |= EVAS_EVENT_FLAG_ON_HOLD;
sid->down.last_hold_x_wheel = EINA_TRUE;
hold = EINA_TRUE;
}
else sid->down.last_hold_x_wheel = EINA_FALSE;
sid->down.last_time_x_wheel = t;
@ -2024,14 +2036,14 @@ _scroll_wheel_post_event_cb(void *data, Evas *e EINA_UNUSED)
(((t - sid->down.last_time_y_wheel) < 0.5) &&
(sid->down.last_hold_y_wheel)))
{
ev->event_flags |= EVAS_EVENT_FLAG_ON_HOLD;
sid->down.last_hold_y_wheel = EINA_TRUE;
hold = EINA_TRUE;
}
else sid->down.last_hold_y_wheel = EINA_FALSE;
sid->down.last_time_y_wheel = t;
}
return EINA_FALSE;
return !hold;
}
static void