summaryrefslogtreecommitdiffstats
path: root/views
diff options
context:
space:
mode:
authorsadrul@chromium.org <sadrul@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-02-28 17:27:15 +0000
committersadrul@chromium.org <sadrul@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-02-28 17:27:15 +0000
commit0708463343f3616803163d04ad6473e874506464 (patch)
tree58ec65101f8c78ba4c06530d0bef0c9213af0266 /views
parent62b590adb8870c82956325f458f305d9e4e97296 (diff)
downloadchromium_src-0708463343f3616803163d04ad6473e874506464.zip
chromium_src-0708463343f3616803163d04ad6473e874506464.tar.gz
chromium_src-0708463343f3616803163d04ad6473e874506464.tar.bz2
Fix setting cursor for WidgetGtk.
BUG=none TEST=none Review URL: http://codereview.chromium.org/6591028 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@76226 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'views')
-rw-r--r--views/widget/widget_gtk.cc6
1 files changed, 4 insertions, 2 deletions
diff --git a/views/widget/widget_gtk.cc b/views/widget/widget_gtk.cc
index bb61a3e..0eca3d7 100644
--- a/views/widget/widget_gtk.cc
+++ b/views/widget/widget_gtk.cc
@@ -860,8 +860,10 @@ void WidgetGtk::SetCursor(gfx::NativeCursor cursor) {
if (!TouchFactory::GetInstance()->is_cursor_visible())
cursor = gfx::GetCursor(GDK_BLANK_CURSOR);
#endif
- if (widget_)
- gdk_window_set_cursor(widget_->window, cursor);
+ // |window_contents_| is placed on top of |widget_|. So the cursor needs to be
+ // set on |window_contents_| instead of |widget_|.
+ if (window_contents_)
+ gdk_window_set_cursor(window_contents_->window, cursor);
}
void WidgetGtk::ClearNativeFocus() {