diff options
author | sadrul@chromium.org <sadrul@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-08-15 23:15:07 +0000 |
---|---|---|
committer | sadrul@chromium.org <sadrul@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-08-15 23:15:07 +0000 |
commit | e2f0954d5f4ecbcd8b701e0b74b677c8b2ed3eeb (patch) | |
tree | 2417dc077c96404457f4dfae53490480cbdc5c64 /views/widget/native_widget_view.cc | |
parent | 109f3d80239c07211d92286042bf7b77119ed9bf (diff) | |
download | chromium_src-e2f0954d5f4ecbcd8b701e0b74b677c8b2ed3eeb.zip chromium_src-e2f0954d5f4ecbcd8b701e0b74b677c8b2ed3eeb.tar.gz chromium_src-e2f0954d5f4ecbcd8b701e0b74b677c8b2ed3eeb.tar.bz2 |
views-desktop: Fix updating the cursor for windows.
It is necessary to remember the cursor set for the associated widget in the NativeWidgetView so that it can return the correct cursor when the parent Widget requests for it.
BUG=none
TEST=manually (launch chrome with views-desktop, move cursor over a link/textfield and see the cursor change properly)
Review URL: http://codereview.chromium.org/7633018
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@96852 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'views/widget/native_widget_view.cc')
-rw-r--r-- | views/widget/native_widget_view.cc | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/views/widget/native_widget_view.cc b/views/widget/native_widget_view.cc index 85cb30e..c816c0f 100644 --- a/views/widget/native_widget_view.cc +++ b/views/widget/native_widget_view.cc @@ -18,7 +18,8 @@ const char NativeWidgetView::kViewClassName[] = "views/NativeWidgetView"; NativeWidgetView::NativeWidgetView(NativeWidgetViews* native_widget) : native_widget_(native_widget), sent_create_(false), - delete_native_widget_(true) { + delete_native_widget_(true), + cursor_(NULL) { } NativeWidgetView::~NativeWidgetView() { @@ -69,6 +70,10 @@ void NativeWidgetView::OnPaint(gfx::Canvas* canvas) { delegate()->OnNativeWidgetPaint(canvas); } +gfx::NativeCursor NativeWidgetView::GetCursor(const MouseEvent& event) { + return cursor_; +} + bool NativeWidgetView::OnMousePressed(const MouseEvent& event) { MouseEvent e(event, this); return delegate()->OnMouseEvent(event); |