Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(161)

Unified Diff: ui/views/widget/widget.cc

Issue 6756043: Consolidate Widget Event code, other cleanup. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Sync and merge. Created 9 years, 9 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « ui/views/widget/native_widget_win.cc ('k') | views/controls/menu/menu_host_gtk.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/views/widget/widget.cc
diff --git a/ui/views/widget/widget.cc b/ui/views/widget/widget.cc
index 3b2746affae8d275aaa11307d6090ddf1b397f53..9bb451317e457964ffd5cf8468ad5732fd10f7df 100644
--- a/ui/views/widget/widget.cc
+++ b/ui/views/widget/widget.cc
@@ -159,9 +159,9 @@ void Widget::OnMouseCaptureLost() {
}
bool Widget::OnMouseEvent(const MouseEvent& event) {
- last_mouse_event_was_move_ = false;
switch (event.type()) {
case ui::Event::ET_MOUSE_PRESSED:
+ last_mouse_event_was_move_ = false;
if (root_view_->OnMousePressed(event)) {
is_mouse_button_pressed_ = true;
if (!native_widget_->HasMouseCapture())
@@ -178,6 +178,7 @@ bool Widget::OnMouseEvent(const MouseEvent& event) {
native_widget_->ShouldReleaseCaptureOnMouseReleased()) {
native_widget_->ReleaseMouseCapture();
}
+ last_mouse_event_was_move_ = false;
is_mouse_button_pressed_ = false;
root_view_->OnMouseReleased(event);
return true;
@@ -199,6 +200,7 @@ bool Widget::OnMouseEvent(const MouseEvent& event) {
}
break;
case ui::Event::ET_MOUSE_EXITED:
+ last_mouse_event_was_move_ = false;
root_view_->OnMouseExited(event);
return true;
}
« no previous file with comments | « ui/views/widget/native_widget_win.cc ('k') | views/controls/menu/menu_host_gtk.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698