diff options
Diffstat (limited to 'src/ui/touch.c')
-rw-r--r-- | src/ui/touch.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/ui/touch.c b/src/ui/touch.c index c5634788..f1aa8f06 100644 --- a/src/ui/touch.c +++ b/src/ui/touch.c | |||
@@ -227,7 +227,7 @@ static void dispatchButtonUp_Touch_(iFloat3 pos) { | |||
227 | 227 | ||
228 | static void dispatchNotification_Touch_(const iTouch *d, int code) { | 228 | static void dispatchNotification_Touch_(const iTouch *d, int code) { |
229 | if (d->affinity) { | 229 | if (d->affinity) { |
230 | iRoot *oldRoot = get_Root(); | 230 | iRoot *oldRoot = current_Root(); |
231 | setCurrent_Root(d->affinity->root); | 231 | setCurrent_Root(d->affinity->root); |
232 | dispatchEvent_Widget(d->affinity, (SDL_Event *) &(SDL_UserEvent){ | 232 | dispatchEvent_Widget(d->affinity, (SDL_Event *) &(SDL_UserEvent){ |
233 | .type = SDL_USEREVENT, | 233 | .type = SDL_USEREVENT, |
@@ -334,7 +334,7 @@ static void update_TouchState_(void *ptr) { | |||
334 | } | 334 | } |
335 | /* Keep updating if interaction is still ongoing. */ | 335 | /* Keep updating if interaction is still ongoing. */ |
336 | if (!isEmpty_Array(d->touches) || !isEmpty_Array(d->moms)) { | 336 | if (!isEmpty_Array(d->touches) || !isEmpty_Array(d->moms)) { |
337 | addTicker_App(update_TouchState_, ptr); | 337 | addTickerRoot_App(update_TouchState_, NULL, ptr); |
338 | } | 338 | } |
339 | } | 339 | } |
340 | 340 | ||
@@ -479,7 +479,7 @@ iBool processEvent_Touch(const SDL_Event *ev) { | |||
479 | } | 479 | } |
480 | /* This may begin a pinch. */ | 480 | /* This may begin a pinch. */ |
481 | checkNewPinch_TouchState_(d, back_Array(d->touches)); | 481 | checkNewPinch_TouchState_(d, back_Array(d->touches)); |
482 | addTicker_App(update_TouchState_, d); | 482 | addTickerRoot_App(update_TouchState_, NULL, d); |
483 | } | 483 | } |
484 | else if (ev->type == SDL_FINGERMOTION) { | 484 | else if (ev->type == SDL_FINGERMOTION) { |
485 | iTouch *touch = find_TouchState_(d, fing->fingerId); | 485 | iTouch *touch = find_TouchState_(d, fing->fingerId); |