diff options
Diffstat (limited to 'src/views/SkWindow.cpp')
| -rw-r--r-- | src/views/SkWindow.cpp | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/src/views/SkWindow.cpp b/src/views/SkWindow.cpp index b02631d2bf..0f0d9c179f 100644 --- a/src/views/SkWindow.cpp +++ b/src/views/SkWindow.cpp @@ -358,12 +358,13 @@ bool SkWindow::onHandleKeyUp(SkKey key) return false; } -bool SkWindow::handleClick(int x, int y, Click::State state, void *owner) { - return this->onDispatchClick(x, y, state, owner); +bool SkWindow::handleClick(int x, int y, Click::State state, void *owner, + unsigned modifierKeys) { + return this->onDispatchClick(x, y, state, owner, modifierKeys); } bool SkWindow::onDispatchClick(int x, int y, Click::State state, - void* owner) { + void* owner, unsigned modifierKeys) { bool handled = false; // First, attempt to find an existing click with this owner. @@ -382,25 +383,25 @@ bool SkWindow::onDispatchClick(int x, int y, Click::State state, fClicks.remove(index); } Click* click = this->findClickHandler(SkIntToScalar(x), - SkIntToScalar(y)); + SkIntToScalar(y), modifierKeys); if (click) { click->fOwner = owner; *fClicks.append() = click; - SkView::DoClickDown(click, x, y); + SkView::DoClickDown(click, x, y, modifierKeys); handled = true; } break; } case Click::kMoved_State: if (index != -1) { - SkView::DoClickMoved(fClicks[index], x, y); + SkView::DoClickMoved(fClicks[index], x, y, modifierKeys); handled = true; } break; case Click::kUp_State: if (index != -1) { - SkView::DoClickUp(fClicks[index], x, y); + SkView::DoClickUp(fClicks[index], x, y, modifierKeys); delete fClicks[index]; fClicks.remove(index); handled = true; |