diff options
| author | mukai@chromium.org <mukai@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-04-06 04:43:05 +0000 |
|---|---|---|
| committer | mukai@chromium.org <mukai@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-04-06 04:43:05 +0000 |
| commit | 0a535abe2c77c6c0ca06c62a504daed5df5611e4 (patch) | |
| tree | bc5d3bf853cef53400249519dfb284393d254c70 | |
| parent | eda78e6d19397f54f6cdbba74fae82e7b03b49da (diff) | |
| download | chromium_src-0a535abe2c77c6c0ca06c62a504daed5df5611e4.zip chromium_src-0a535abe2c77c6c0ca06c62a504daed5df5611e4.tar.gz chromium_src-0a535abe2c77c6c0ca06c62a504daed5df5611e4.tar.bz2 | |
Do not start 'dragging' of partial screenshot when mouse is pressed.
In case that mouse is just pressed and released immediately, it should
not take screenshot.
BUG=120475
TEST=manually
Review URL: https://chromiumcodereview.appspot.com/10006001
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@131100 0039d316-1c4b-4281-b951-d872f2087c98
| -rw-r--r-- | ash/wm/partial_screenshot_view.cc | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/ash/wm/partial_screenshot_view.cc b/ash/wm/partial_screenshot_view.cc index 42ae2503..23bdda4 100644 --- a/ash/wm/partial_screenshot_view.cc +++ b/ash/wm/partial_screenshot_view.cc @@ -87,13 +87,13 @@ void PartialScreenshotView::OnPaint(gfx::Canvas* canvas) { bool PartialScreenshotView::OnMousePressed(const views::MouseEvent& event) { start_position_ = event.location(); - is_dragging_ = true; return true; } bool PartialScreenshotView::OnMouseDragged(const views::MouseEvent& event) { current_position_ = event.location(); SchedulePaint(); + is_dragging_ = true; return true; } @@ -103,8 +103,11 @@ bool PartialScreenshotView::OnMouseWheel(const views::MouseWheelEvent& event) { } void PartialScreenshotView::OnMouseReleased(const views::MouseEvent& event) { - is_dragging_ = false; Cancel(); + if (!is_dragging_) + return; + + is_dragging_ = false; if (screenshot_delegate_) { aura::RootWindow *root_window = Shell::GetRootWindow(); screenshot_delegate_->HandleTakePartialScreenshot( |