From 78272c667f008f6afcf5f84e0add525b56c3a558 Mon Sep 17 00:00:00 2001 From: Liang Qi Date: Tue, 31 Oct 2023 22:34:32 +0100 Subject: xcb: implement QXcbCursor::size() A follow up of baed8534bc1dac36a9d0ef4240fc14398076a192 . Fixes: QTBUG-118612 Pick-to: 6.6 6.5 6.2 Change-Id: I7b4a2276c6e6a14d5413f6cd64d801de11cc8c3e Reviewed-by: JiDe Zhang Reviewed-by: Axel Spoerl --- src/plugins/platforms/xcb/qxcbcursor.cpp | 8 ++++++++ src/plugins/platforms/xcb/qxcbcursor.h | 2 ++ 2 files changed, 10 insertions(+) (limited to 'src/plugins/platforms/xcb') diff --git a/src/plugins/platforms/xcb/qxcbcursor.cpp b/src/plugins/platforms/xcb/qxcbcursor.cpp index 8f087edc9b..dc9ed46956 100644 --- a/src/plugins/platforms/xcb/qxcbcursor.cpp +++ b/src/plugins/platforms/xcb/qxcbcursor.cpp @@ -10,6 +10,7 @@ #include #include #include +#include #if QT_CONFIG(xcb_xlib) #include @@ -288,6 +289,13 @@ QXcbCursor::~QXcbCursor() xcb_cursor_context_free(m_cursorContext); } +QSize QXcbCursor::size() const +{ + if (const QPlatformTheme *theme = QGuiApplicationPrivate::platformTheme()) + return theme->themeHint(QPlatformTheme::MouseCursorSize).toSize(); + return QSize(24, 24); +} + void QXcbCursor::updateContext() { if (m_cursorContext) diff --git a/src/plugins/platforms/xcb/qxcbcursor.h b/src/plugins/platforms/xcb/qxcbcursor.h index 14958f824b..bf26861e8f 100644 --- a/src/plugins/platforms/xcb/qxcbcursor.h +++ b/src/plugins/platforms/xcb/qxcbcursor.h @@ -48,6 +48,8 @@ public: QPoint pos() const override; void setPos(const QPoint &pos) override; + QSize size() const override; + void updateContext(); static void queryPointer(QXcbConnection *c, QXcbVirtualDesktop **virtualDesktop, QPoint *pos, int *keybMask = nullptr); -- cgit v1.2.3