feat: Add support for modifying the plugin popup cursor shape via the…#424
Merged
deepin-bot[bot] merged 1 commit intolinuxdeepin:masterfrom Mar 3, 2026
Merged
Conversation
Reviewer's GuideAdds Wayland protocol and plumbing to allow plugins to request cursor shape changes for popup widgets, wiring widget cursor changes through PluginPopup to the plugin-manager-v1 set_cursor request. Sequence diagram for plugin popup cursor shape change flowsequenceDiagram
actor User
participant PopupWidget
participant EventFilter
participant PluginPopup
participant PluginPopupSurface
participant PluginManagerV1
participant WaylandCompositor
User->>PopupWidget: Move pointer over popup
PopupWidget->>EventFilter: QEvent::CursorChange
EventFilter->>EventFilter: handleCursorChange(widget)
EventFilter->>PluginPopup: requestSetCursor(cursorShape)
PluginPopup->>PluginPopupSurface: signal requestSetCursor(cursorShape)
PluginPopupSurface->>PluginPopupSurface: set_cursor(cursorShape)
PluginPopupSurface->>PluginManagerV1: request set_cursor(cursor_shape)
PluginManagerV1->>WaylandCompositor: set_cursor(cursor_shape)
WaylandCompositor-->>User: Updated cursor shape
Class diagram for updated PluginPopup and EventFilter cursor handlingclassDiagram
class QObject
class QWidget
class QWindow
class QEvent
class QHelpEvent
class QTimer
class EventFilter {
+bool eventFilter(QObject watched, QEvent event)
-void updateToolTipPosition(QPoint globalPos)
-void handleCursorChange(QWidget widget)
}
class PluginPopup {
-QWindow window
+int x()
+int y()
+void xChanged()
+void yChanged()
+void pluginPosChanged(QPoint point)
+void requestSetCursor(int cursorShape)
-PluginPopup(QWindow window)
+static PluginPopup getWithoutCreating(QWindow window)
}
class PluginPopupSurface {
-PluginManagerIntegration manager
-QtWaylandClientShellSurface shellSurface
-PluginPopup popup
-QTimer m_dirtyTimer
+PluginPopupSurface(PluginManagerIntegration manager, QtWaylandClientShellSurface shellSurface, PluginPopup popup)
+~PluginPopupSurface()
-void set_position(int x, int y)
-void set_cursor(int cursorShape)
}
QObject <|-- EventFilter
QObject <|-- PluginPopup
QWidget <|-- PopupWidget
QWindow <.. PluginPopup
PluginPopupSurface o-- PluginPopup
PluginPopupSurface o-- QTimer
EventFilter ..> QWidget : handleCursorChange
EventFilter ..> PluginPopup : getWithoutCreating
EventFilter ..> PluginPopup : requestSetCursor
PluginPopupSurface ..> PluginPopup : requestSetCursor signal
PluginPopupSurface ..> QTimer : timeout connection
File-Level Changes
Tips and commandsInteracting with Sourcery
Customizing Your ExperienceAccess your dashboard to:
Getting Help
|
![sourcery-ai[bot]](https://avatars.githubusercontent.com/in/48477?s=60&v=4){kind=small}
There was a problem hiding this comment.
Hey - I've left some high level feedback:
- The
handleCursorChangepath assumes anyQEvent::CursorChangeshould be forwarded; consider validating that the cursor shape actually changed from the last sent value to avoid spammingset_cursorrequests during rapid cursor updates. - Since the protocol now relies on integer values matching
Qt::CursorShape, it may be safer to introduce an explicit mapping/validation layer (e.g. a small switch or helper) rather than sendingstatic_cast<int>(cursorShape)directly, to guard against enum changes or unexpected values.
Prompt for AI Agents
Please address the comments from this code review:
## Overall Comments
- The `handleCursorChange` path assumes any `QEvent::CursorChange` should be forwarded; consider validating that the cursor shape actually changed from the last sent value to avoid spamming `set_cursor` requests during rapid cursor updates.
- Since the protocol now relies on integer values matching `Qt::CursorShape`, it may be safer to introduce an explicit mapping/validation layer (e.g. a small switch or helper) rather than sending `static_cast<int>(cursorShape)` directly, to guard against enum changes or unexpected values.Help me be more useful! Please click 👍 or 👎 on each comment and I'll use the feedback to improve your reviews.
yixinshark
force-pushed
the
feat-addCursorShape
branch
from
fe7b51c to
6667e22
Compare
yixinshark
force-pushed
the
feat-addCursorShape
branch
from
6667e22 to
c34962d
Compare
18202781743
approved these changes
Feb 5, 2026
|
[APPROVALNOTIFIER] This PR is NOT APPROVED This pull-request has been approved by: 18202781743, yixinshark The full list of commands accepted by this bot can be found here. DetailsNeeds approval from an approver in each of these files:Approvers can indicate their approval by writing |
|
TAG Bot New tag: 2.0.25 |
yixinshark
force-pushed
the
feat-addCursorShape
branch
from
c34962d to
ceb6fcf
Compare
|
TAG Bot New tag: 2.0.26 |
… protocol. add support in plugin-manager-v1.xml Log: Add support for modifying the plugin popup cursor shape via the protocol.
yixinshark
force-pushed
the
feat-addCursorShape
branch
from
ceb6fcf to
396fd27
Compare
deepin pr auto review这段代码实现了一个在 Wayland 环境下，当 Widget 鼠标光标形状发生变化时，通过 Wayland 协议同步更新到插件弹窗（PluginPopup）的功能。整体逻辑是通顺的，但在语法逻辑、代码质量、性能和安全性方面有如下改进意见： 1. 语法逻辑与代码质量
2. 代码性能
3. 代码安全
4. 详细代码改进建议针对 void handleCursorChange(QWidget *widget)
{
if (!widget || !widget->window() || !widget->window()->windowHandle())
return;
auto windowHandle = widget->window()->windowHandle();
if (auto pluginPopup = Plugin::PluginPopup::getWithoutCreating(windowHandle)) {
Qt::CursorShape cursorShape = widget->cursor().shape();
// 安全性改进：检查枚举值是否在 Qt 定义的合法范围内
// 假设 Qt::LastCursor 是最后一个枚举值
if (cursorShape < 0 || cursorShape > Qt::LastCursor) {
qWarning() << "Invalid cursor shape detected:" << static_cast<int>(cursorShape);
return; // 或者设置为一个默认值，如 Qt::ArrowCursor
}
Q_EMIT pluginPopup->requestSetCursor(static_cast<int>(cursorShape));
}
}总结这段代码实现了功能需求，逻辑清晰，Qt 风格运用得当。 |
Contributor
Author
|
/forcemerge |
|
This pr force merged! (status: blocked) |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
… protocol.
add support in plugin-manager-v1.xml
Log: Add support for modifying the plugin popup cursor shape via the protocol.
Summary by Sourcery
Add support for changing the plugin popup cursor shape via the Wayland plugin manager protocol and integrate it with widget event handling.
New Features:
Enhancements: