Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(688)

Unified Diff: ui/aura/root_window_host_linux.cc

Issue 10854211: aura: Use the default high-dpi cursor for unsupported cursors. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: . Created 8 years, 4 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/aura/root_window_host_linux.cc
diff --git a/ui/aura/root_window_host_linux.cc b/ui/aura/root_window_host_linux.cc
index 4dd801e4b61d9aa0c9a0fa07347ec95f96952e74..afbd2796ffc4e740b584786cfb445c8afd9ecb0f 100644
--- a/ui/aura/root_window_host_linux.cc
+++ b/ui/aura/root_window_host_linux.cc
@@ -1032,12 +1032,17 @@ bool RootWindowHostLinux::IsWindowManagerPresent() {
}
void RootWindowHostLinux::SetCursorInternal(gfx::NativeCursor cursor) {
- ::Cursor xcursor =
- image_cursors_->IsImageCursor(cursor) ?
- image_cursors_->ImageCursorFromNative(cursor) :
- (cursor == ui::kCursorNone ? invisible_cursor_ :
- (cursor == ui::kCursorCustom ? cursor.platform() :
- ui::GetXCursor(CursorShapeFromNative(cursor))));
+ ::Cursor xcursor;
+ if (image_cursors_->IsImageCursor(cursor))
+ xcursor = image_cursors_->ImageCursorFromNative(cursor);
+ else if (cursor == ui::kCursorNone)
+ xcursor = invisible_cursor_;
+ else if (cursor == ui::kCursorCustom)
+ xcursor = cursor.platform();
+ else if (delegate_->GetDeviceScaleFactor() == 1.0)
+ xcursor = ui::GetXCursor(CursorShapeFromNative(cursor));
+ else
+ xcursor = image_cursors_->ImageCursorFromNative(ui::kCursorPointer);
XDefineCursor(xdisplay_, xwindow_, xcursor);
}
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698