Commit 4af19263 authored by Fabian Vogt's avatar Fabian Vogt

Use XCursorTheme on wayland as well

Summary: wayland-cursor uses xcursor to load cursors, so this is fine.

Test Plan: I can select cursors on wayland again.

Reviewers: #plasma, davidedmundson

Reviewed By: #plasma, davidedmundson

Subscribers: plasma-devel

Tags: #plasma

Differential Revision: https://phabricator.kde.org/D12361
parent ebdfab7e
......@@ -306,11 +306,6 @@ void CursorThemeModel::processThemeDir(const QDir &themeDir)
if (!themeDir.exists("index.theme") && !haveCursors)
return;
static bool isX11 = QX11Info::isPlatformX11();
if (!isX11) {
// TODO: implement Wayland Cursor Theme support
return;
}
// Create a cursor theme object for the theme dir
XCursorTheme *theme = new XCursorTheme(themeDir);
......
......@@ -158,6 +158,9 @@ int XCursorTheme::autodetectCursorSize() const
int size = 0;
int dpi = 0;
Display *dpy = QX11Info::display();
// Fallback on wayland
if (!dpy)
return 24;
// The string "v" is owned and will be destroyed by Xlib
char *v = XGetDefault(dpy, "Xft", "dpi");
if (v)
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment