diff options
| author | saintlou@chromium.org <saintlou@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-03-23 19:36:13 +0000 |
|---|---|---|
| committer | saintlou@chromium.org <saintlou@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-03-23 19:36:13 +0000 |
| commit | 4cd6d6ef5ed215b353609032303a2bd11cb79e74 (patch) | |
| tree | 3a64c6644d79bcfd3890528f93b90e7b9d066684 /views | |
| parent | c68071c67c77018785f7ca06cb18e34189e24ea9 (diff) | |
| download | chromium_src-4cd6d6ef5ed215b353609032303a2bd11cb79e74.zip chromium_src-4cd6d6ef5ed215b353609032303a2bd11cb79e74.tar.gz chromium_src-4cd6d6ef5ed215b353609032303a2bd11cb79e74.tar.bz2 | |
Amending issue 6716024
BUG=76976
TEST=none
Review URL: http://codereview.chromium.org/6705028
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@79163 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'views')
| -rw-r--r-- | views/widget/root_view.cc | 6 | ||||
| -rw-r--r-- | views/widget/widget_gtk.cc | 5 |
2 files changed, 5 insertions, 6 deletions
diff --git a/views/widget/root_view.cc b/views/widget/root_view.cc index dc6cc67..fed3f01 100644 --- a/views/widget/root_view.cc +++ b/views/widget/root_view.cc @@ -399,14 +399,14 @@ void RootView::GetAccessibleState(ui::AccessibleViewState* state) { #if defined(TOUCH_UI) // Always show the mouse cursor, useful when debugging touch builds -static bool keep_mouse_cursor_; +static bool keep_mouse_cursor; void RootView::SetKeepMouseCursor(bool keep) { - keep_mouse_cursor_ = keep; + keep_mouse_cursor = keep; } bool RootView::GetKeepMouseCursor() { - return keep_mouse_cursor_; + return keep_mouse_cursor; } #endif diff --git a/views/widget/widget_gtk.cc b/views/widget/widget_gtk.cc index 7f256c2..d547386 100644 --- a/views/widget/widget_gtk.cc +++ b/views/widget/widget_gtk.cc @@ -917,9 +917,8 @@ void WidgetGtk::SchedulePaintInRect(const gfx::Rect& rect) { void WidgetGtk::SetCursor(gfx::NativeCursor cursor) { #if defined(TOUCH_UI) && defined(HAVE_XINPUT2) - if (RootView::GetKeepMouseCursor()) - cursor = gfx::GetCursor(GDK_ARROW); - else if (!TouchFactory::GetInstance()->is_cursor_visible()) + if (!TouchFactory::GetInstance()->is_cursor_visible() && + !RootView::GetKeepMouseCursor()) cursor = gfx::GetCursor(GDK_BLANK_CURSOR); #endif // |window_contents_| is placed on top of |widget_|. So the cursor needs to be |