Skip to content

sync: from linuxdeepin/qt5platform-plugins #108

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
mhduiy merged 1 commit into from
Dec 4, 2025
Merged

sync: from linuxdeepin/qt5platform-plugins #108

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
35 changes: 29 additions & 6 deletions xcb/dplatformintegration.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1064,13 +1064,35 @@ static void cursorThemePropertyChanged(xcb_connection_t *connection, const QByte
Q_UNUSED(property);
Q_UNUSED(handle)

QMetaObject::invokeMethod(qApp, [](){
for (const auto window : qApp->allWindows()) {
auto cursor = window->cursor();
if (window->screen() && window->screen()->handle() && window->screen()->handle()->cursor())
overrideChangeCursor(window->screen()->handle()->cursor(), &cursor, window);
// TODO: https://qt-project.atlassian.net/browse/QTBUG-142329 这个BUG解决之后可将这里的代码删除
for (QScreen *screen : qApp->screens()) {
if (screen && screen->handle() && screen->handle()->cursor()) {
QXcbCursor *xcb_cursor = static_cast<QXcbCursor *>(screen->handle()->cursor());

if (xcb_cursor == nullptr) {
continue;
}
xcb_cursor->m_cursorHash.clear();

// source from: QXCBCursor::updateContext()
if (xcb_cursor->m_cursorContext) {
xcb_cursor_context_free(xcb_cursor->m_cursorContext);
}
xcb_cursor->m_cursorContext = nullptr;
xcb_connection_t *conn = xcb_cursor->xcb_connection();

if (xcb_cursor_context_new(conn, xcb_cursor->m_screen->screen(), &xcb_cursor->m_cursorContext) < 0) {
xcb_cursor->m_cursorContext = nullptr;
}
}
}

for (const auto window : qApp->allWindows()) {
auto cursor = window->cursor();
if (window->screen() && window->screen()->handle() && window->screen()->handle()->cursor()) {
overrideChangeCursor(window->screen()->handle()->cursor(), &cursor, window);
}
}, Qt::QueuedConnection);
}
}

void DPlatformIntegration::initialize()
Expand Down Expand Up @@ -1196,6 +1218,7 @@ void DPlatformIntegration::initialize()

// Qt中同样监听了这个属性的变化，但是只刷新了光标上下文却没有更新当前窗口的光标，无法做到光标的实时变化，所以加了该逻辑额外处理
xSettings()->registerCallbackForProperty("Gtk/CursorThemeName", cursorThemePropertyChanged, nullptr);
xSettings()->registerCallbackForProperty("Gtk/CursorThemeSize", cursorThemePropertyChanged, nullptr);
}

#ifdef Q_OS_LINUX
Expand Down
Loading