Index: ui/views/widget/widget.cc |
diff --git a/ui/views/widget/widget.cc b/ui/views/widget/widget.cc |
index 8a1923df928acbbe7594a567b13bae45e083b8cc..d8d78d5ff1cdaa4c96c784f839cb5f839ce51db4 100644 |
--- a/ui/views/widget/widget.cc |
+++ b/ui/views/widget/widget.cc |
@@ -200,7 +200,8 @@ Widget::Widget() |
is_mouse_button_pressed_(false), |
is_touch_down_(false), |
last_mouse_event_was_move_(false), |
- root_layers_dirty_(false) { |
+ root_layers_dirty_(false), |
+ movement_disabled_(false) { |
} |
Widget::~Widget() { |
@@ -1121,9 +1122,14 @@ void Widget::OnNativeWidgetPaint(gfx::Canvas* canvas) { |
} |
int Widget::GetNonClientComponent(const gfx::Point& point) { |
- return non_client_view_ ? |
+ int component = non_client_view_ ? |
non_client_view_->NonClientHitTest(point) : |
HTNOWHERE; |
+ |
+ if (movement_disabled_ && (component == HTCAPTION || component == HTSYSMENU)) |
Ben Goodger (Google)
2013/01/23 19:10:46
HTNOWHERE... will this cause events to get sent st
Mike Wittman
2013/01/23 21:52:31
Yes, I checked and we still get mouse events in Wi
|
+ return HTNOWHERE; |
+ else |
+ return component; |
Ben Goodger (Google)
2013/01/23 19:10:46
nit: no else after return
Mike Wittman
2013/01/23 21:52:31
Done.
|
} |
void Widget::OnKeyEvent(ui::KeyEvent* event) { |