diff options
| author | Peter Hutterer <peter.hutterer@who-t.net> | 2014-12-18 10:21:48 +1000 |
|---|---|---|
| committer | Peter Hutterer <peter.hutterer@who-t.net> | 2014-12-23 11:14:39 +1000 |
| commit | 54c972402fd69ac0c495e2af00fb797a4dec4ba9 (patch) | |
| tree | b188270a83b65b6ec8003e91ce8698cd8931b0ef /src/evdev-mt-touchpad-edge-scroll.c | |
| parent | b74330255b8aa65979ce3d1621c847b58627080e (diff) | |
touchpad: rename scroll.state to scroll.edge_state
In preparation for a twofinger_state field, to avoid confusion.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Diffstat (limited to 'src/evdev-mt-touchpad-edge-scroll.c')
| -rw-r--r-- | src/evdev-mt-touchpad-edge-scroll.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/evdev-mt-touchpad-edge-scroll.c b/src/evdev-mt-touchpad-edge-scroll.c index 616080fa..bc6831dd 100644 --- a/src/evdev-mt-touchpad-edge-scroll.c +++ b/src/evdev-mt-touchpad-edge-scroll.c @@ -69,7 +69,7 @@ tp_edge_scroll_set_state(struct tp_dispatch *tp, { libinput_timer_cancel(&t->scroll.timer); - t->scroll.state = state; + t->scroll.edge_state = state; switch (state) { case EDGE_SCROLL_TOUCH_STATE_NONE: @@ -207,7 +207,7 @@ tp_edge_scroll_handle_event(struct tp_dispatch *tp, struct tp_touch *t, enum scroll_event event) { - switch (t->scroll.state) { + switch (t->scroll.edge_state) { case EDGE_SCROLL_TOUCH_STATE_NONE: tp_edge_scroll_handle_none(tp, t, event); break; @@ -374,5 +374,5 @@ tp_edge_scroll_stop_events(struct tp_dispatch *tp, uint64_t time) int tp_edge_scroll_touch_active(struct tp_dispatch *tp, struct tp_touch *t) { - return t->scroll.state == EDGE_SCROLL_TOUCH_STATE_AREA; + return t->scroll.edge_state == EDGE_SCROLL_TOUCH_STATE_AREA; } |