diff options
| author | ben@chromium.org <ben@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-10-04 14:45:07 +0000 |
|---|---|---|
| committer | ben@chromium.org <ben@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-10-04 14:45:07 +0000 |
| commit | 0207c92d4fec87764ea65bc8f5fd3c8bd2d0754d (patch) | |
| tree | 26cdc0f0149812893fa7cc22d086387285db6562 /ui/aura_shell | |
| parent | 1d887b27477d3b8af67ff392d704b430fa9a4c08 (diff) | |
| download | chromium_src-0207c92d4fec87764ea65bc8f5fd3c8bd2d0754d.zip chromium_src-0207c92d4fec87764ea65bc8f5fd3c8bd2d0754d.tar.gz chromium_src-0207c92d4fec87764ea65bc8f5fd3c8bd2d0754d.tar.bz2 | |
Fixes the cursor to update reliably when moving from window to window.
http://crbug.com/98337
TEST=none
Review URL: http://codereview.chromium.org/8122008
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@103882 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ui/aura_shell')
| -rw-r--r-- | ui/aura_shell/toplevel_frame_view.cc | 25 | ||||
| -rw-r--r-- | ui/aura_shell/toplevel_frame_view.h | 1 |
2 files changed, 26 insertions, 0 deletions
diff --git a/ui/aura_shell/toplevel_frame_view.cc b/ui/aura_shell/toplevel_frame_view.cc index 11590c7..cdbc4b4 100644 --- a/ui/aura_shell/toplevel_frame_view.cc +++ b/ui/aura_shell/toplevel_frame_view.cc @@ -471,5 +471,30 @@ views::View* ToplevelFrameView::GetEventHandlerForPoint( return View::GetEventHandlerForPoint(point); } +gfx::NativeCursor ToplevelFrameView::GetCursor(const views::MouseEvent& event) { +#if defined(OS_WIN) + switch (current_hittest_code_) { + case HTTOPLEFT: + case HTBOTTOMRIGHT: + return LoadCursor(NULL, IDC_SIZENWSE); + case HTTOP: + case HTBOTTOM: + return LoadCursor(NULL, IDC_SIZENS); + case HTTOPRIGHT: + case HTBOTTOMLEFT: + return LoadCursor(NULL, IDC_SIZENESW); + case HTRIGHT: + case HTLEFT: + return LoadCursor(NULL, IDC_SIZEWE); + default: + break; + } + return NULL; +#elif defined(OS_LINUX) + NOTIMPLEMENTED(); + return NULL; +#endif +} + } // namespace internal } // namespace aura_shell diff --git a/ui/aura_shell/toplevel_frame_view.h b/ui/aura_shell/toplevel_frame_view.h index 10772dc..46d20fb 100644 --- a/ui/aura_shell/toplevel_frame_view.h +++ b/ui/aura_shell/toplevel_frame_view.h @@ -66,6 +66,7 @@ class AURA_SHELL_EXPORT ToplevelFrameView : public views::NonClientFrameView { virtual void OnMouseExited(const views::MouseEvent& event) OVERRIDE; virtual views::View* GetEventHandlerForPoint( const gfx::Point& point) OVERRIDE; + virtual gfx::NativeCursor GetCursor(const views::MouseEvent& event) OVERRIDE; gfx::Rect client_view_bounds_; |