diff options
| -rw-r--r-- | ui/aura/toplevel_window_event_filter.cc | 4 | ||||
| -rw-r--r-- | views/events/event_aura.cc | 2 | ||||
| -rw-r--r-- | views/widget/native_widget_aura.cc | 2 |
3 files changed, 7 insertions, 1 deletions
diff --git a/ui/aura/toplevel_window_event_filter.cc b/ui/aura/toplevel_window_event_filter.cc index e867f80..98d29d3 100644 --- a/ui/aura/toplevel_window_event_filter.cc +++ b/ui/aura/toplevel_window_event_filter.cc @@ -175,6 +175,10 @@ bool ToplevelWindowEventFilter::HandleDrag(Window* target, MouseEvent* event) { if (bounds_change == kBoundsChange_None) return false; + // Only a normal window can be moved/resized. + if (target->show_state() != ui::SHOW_STATE_NORMAL) + return false; + target->SetBounds(gfx::Rect(GetOriginForDrag(bounds_change, target, event), GetSizeForDrag(bounds_change, target, event))); return true; diff --git a/views/events/event_aura.cc b/views/events/event_aura.cc index c1d09d2..b4e8d94 100644 --- a/views/events/event_aura.cc +++ b/views/events/event_aura.cc @@ -40,7 +40,7 @@ uint16 KeyEvent::GetUnmodifiedCharacter() const { MouseWheelEvent::MouseWheelEvent(const NativeEvent& native_event) : MouseEvent(native_event), - offset_(0 /* TODO(beng): obtain */) { + offset_(ui::GetMouseWheelOffset(native_event->native_event())) { } } // namespace views diff --git a/views/widget/native_widget_aura.cc b/views/widget/native_widget_aura.cc index b261571..76e34c9 100644 --- a/views/widget/native_widget_aura.cc +++ b/views/widget/native_widget_aura.cc @@ -494,6 +494,8 @@ int NativeWidgetAura::GetNonClientComponent(const gfx::Point& point) const { bool NativeWidgetAura::OnMouseEvent(aura::MouseEvent* event) { DCHECK(window_->IsVisible()); + if (event->type() == ui::ET_MOUSEWHEEL) + return delegate_->OnMouseEvent(MouseWheelEvent(event)); return delegate_->OnMouseEvent(MouseEvent(event)); } |