@@ -37,7 +37,7 @@ class UIObject: public UIGestureRecognizerHost, public UIShape, public UIConstra
37
37
function<void (UIObject*)> update;
38
38
39
39
function<bool ()> touchDown;
40
- function<bool ()> mouseMove;
40
+ function<void ()> mouseMove;
41
41
42
42
function<bool ()> touchUp;
43
43
@@ -47,7 +47,7 @@ class UIObject: public UIGestureRecognizerHost, public UIShape, public UIConstra
47
47
48
48
function<bool (UIObject*)> touchUpC;
49
49
50
- function<bool (UIObject*)> mouseMoveC;
50
+ function<void (UIObject*)> mouseMoveC;
51
51
52
52
53
53
// / Common callbacks
@@ -317,11 +317,11 @@ class UIObject: public UIGestureRecognizerHost, public UIShape, public UIConstra
317
317
318
318
319
319
if (!i->touchBroadcast (touchPosition - i->position , type, fingerIndex, level + 1 )) {
320
- if (( i->mouseMove ()) || (i-> mouseMoveC (i))) {
321
- i->registerEvent (MOUSE_MOVE, i);
322
- i->executeCallbacks (UIObject:: MOUSE_MOVE, i);
323
- return true ;
324
- }
320
+ i->mouseMove ();
321
+ i->mouseMoveC ( i);
322
+ i->registerEvent ( MOUSE_MOVE, i);
323
+ i-> executeCallbacks (UIObject::MOUSE_MOVE, i) ;
324
+ return true ;
325
325
} else {
326
326
// ofLog() << "touch move ended up inside children of " << i->name;
327
327
return true ;
0 commit comments