Skip to content

Commit c9264c6

Browse files
committed
Changed mouse move events.
1 parent 0170e09 commit c9264c6

File tree

3 files changed

+8
-7
lines changed

3 files changed

+8
-7
lines changed

.gitignore

+1
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
uiGraphTest/bin/*

src/UIObject.h

+7-7
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ class UIObject: public UIGestureRecognizerHost, public UIShape, public UIConstra
3737
function<void(UIObject*)> update;
3838

3939
function<bool()> touchDown;
40-
function<bool()> mouseMove;
40+
function<void()> mouseMove;
4141

4242
function<bool()> touchUp;
4343

@@ -47,7 +47,7 @@ class UIObject: public UIGestureRecognizerHost, public UIShape, public UIConstra
4747

4848
function<bool(UIObject*)> touchUpC;
4949

50-
function<bool(UIObject*)> mouseMoveC;
50+
function<void(UIObject*)> mouseMoveC;
5151

5252

5353
/// Common callbacks
@@ -317,11 +317,11 @@ class UIObject: public UIGestureRecognizerHost, public UIShape, public UIConstra
317317

318318

319319
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;
325325
} else {
326326
//ofLog() << "touch move ended up inside children of " << i->name;
327327
return true;

0 commit comments

Comments
 (0)