feat: add card-type plugin support to dock panel #1659
Open
wjyrich wants to merge 2 commits into
Open
Conversation
1. Implement new FashionAlignment enum value (2) for dock item alignment 2. Create FashionDockController QML component to manage fashion dock layout and appearance 3. Add "Fashion Mode" menu item in dock context menu for easy mode switching 4. Integrate fashion dock logic into main dock window: adjust width, anchors, margins, window radius, and blur effects 5. Update showdesktop and taskmanager to be hidden or behave differently in fashion mode 6. Ensure width animation when entering/exiting fashion mode 7. Add appropriate DTK blur and styling for fashion dock appearance 8. Update string conversion functions to support the new "fashion" alignment 9. Hide left part and adjust spacing in fashion mode for a compact, floating design Log: Added new dock fashion alignment mode with floating UI and compact layout Influence: 1. Test switching between Center, Left, and Fashion alignment modes via context menu 2. Verify fashion mode only enables on Bottom/Top positions and not in column layout 3. Check that showdesktop widget is hidden in fashion mode 4. Verify dock width and margin adjustments in fashion mode (floating margin, vertical padding) 5. Test taskmanager behavior in fashion mode (no remaining space calculation, no text calculator) 6. Verify blur and color blending correctness in fashion mode for both light and dark themes 7. Test width animation when enabling/disabling fashion mode 8. Verify dock exclusion zone includes floating margin in fashion mode 9. Test on different screen sizes and DPI settings 10. Validate that left part and its items are hidden in fashion mode feat: 新增时尚模式对齐方式 1. 实现新的时尚模式对齐枚举值 (2)，用于 dock 面板的项目对齐 2. 创建 FashionDockController QML 组件，管理时尚模式布局和外观 3. 在 dock 右键菜单中添加 "时尚模式" 菜单项，便于模式切换 4. 将时尚模式逻辑集成到主 dock 窗口中：调整宽度、锚点、边距、窗口圆角和 模糊效果 5. 更新显示桌面和任务管理器，使其在时尚模式下隐藏或改变行为 6. 在进入/退出时尚模式时启用宽度动画 7. 为时尚模式外观添加合适的 DTK 模糊和样式 8. 更新字符串转换函数以支持新的 "fashion" 对齐方式 9. 在时尚模式下隐藏左侧部分并调整间距，实现紧凑浮动设计 Log: 新增时尚模式对齐方式，浮动UI和紧凑布局 Influence: 1. 通过右键菜单测试中心、左对齐和时尚模式之间的切换 2. 验证时尚模式仅在底部/顶部位置且非列布局时启用 3. 检查显示桌面小部件在时尚模式下是否隐藏 4. 验证时尚模式下的 dock 宽度和边距调整（浮动边距、垂直内边距） 5. 测试任务管理器在时尚模式下的行为（无剩余空间计算、无文本计算器） 6. 验证时尚模式下浅色和深色主题的模糊和颜色混合正确性 7. 测试启用/禁用时尚模式时的宽度动画 8. 验证时尚模式下 dock 排除区域包含浮动边距 9. 在不同屏幕尺寸和 DPI 设置下进行测试 10. 验证左侧部分及其项目在时尚模式下是否隐藏
![sourcery-ai[bot]](https://avatars.githubusercontent.com/in/48477?s=60&v=4){kind=small}
|
[APPROVALNOTIFIER] This PR is NOT APPROVED This pull-request has been approved by: wjyrich 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 |
18202781743
reviewed
Jul 6, 2026
|
|
||
| Component { | ||
| id: cardLeftPart | ||
| CardLeftDockArea { |
Contributor
There was a problem hiding this comment.
这个是不是可以做成一个applet，去给dock加载，
18202781743
reviewed
Jul 7, 2026
| id: showdesktop | ||
| readonly property int showDesktopWidth: 10 | ||
| property bool useColumnLayout: Panel.position % 2 | ||
| readonly property bool fashionMode: Panel.rootObject && Panel.rootObject.fashionDock && Panel.rootObject.fashionDock.enabled |
Contributor
There was a problem hiding this comment.
判断fashionMode不用这么复杂，dock的模式是否是fashioMode即可，Panel.rootObject也不会为空，
|
TAG Bot New tag: 2.0.50 |
1. Add Card plugin type to TrayPluginType enum in constants.h 2. Create CardLeftDockArea QML component for displaying card-type plugins in a carousel 3. Integrate card plugin surfaces into DockCompositor lifecycle (add/ remove/find) 4. Implement card area with left-side dock placement, using current/ index navigation 5. Support hover effects, page indicators, and wheel navigation for card area 6. Replace legacy left plugin area with CardLeftDockArea when card plugins exist Log: Added card-type plugin display area with carousel navigation in dock Influence: 1. Test card plugin registration and display in dock left area 2. Verify card plugin area visibility only when card plugins exist 3. Test mouse wheel navigation through card plugin pages 4. Verify hover effects and page indicator behavior 5. Test card plugin surface geometry updates on resize 6. Verify compatibility with existing tray/quick/fixed plugin types 7. Test card area behavior in both horizontal and vertical dock modes 8. Verify area width adapts to dock size and card content feat: 为任务栏添加卡片类型插件支持 1. 在 constants.h 中添加 Card 插件类型到 TrayPluginType 枚举 2. 创建 CardLeftDockArea QML 组件，用于以轮播方式显示卡片类型插件 3. 将卡片插件表面集成到 DockCompositor 的生命周期（添加/移除/查找） 4. 实现左侧任务栏卡片区域，支持当前索引/导航 5. 支持悬停效果、页面指示器和鼠标滚轮导航 6. 当存在卡片插件时，用 CardLeftDockArea 替换传统的左侧插件区域 Log: 新增卡片类型插件显示区域，支持轮播导航 Influence: 1. 测试卡片插件的注册和在任务栏左侧区域的显示 2. 验证卡片插件区域仅在存在卡片插件时可见 3. 测试通过鼠标滚轮在卡片插件页面间导航 4. 验证悬停效果和页面指示器的行为 5. 测试卡片插件表面在窗口大小调整时的几何更新 6. 验证与现有托盘/快捷/固定插件类型的兼容性 7. 测试卡片区域在任务栏水平和垂直模式下的表现 8. 验证区域宽度根据任务栏尺寸和卡片内容自适应
deepin pr auto review★ 总体评分：95分■ 【总体评价】
■ 【详细分析】
■ 【改进建议代码示例】 --- a/panels/dock/cardleft/package/CardLeftDockArea.qml
+++ b/panels/dock/cardleft/package/CardLeftDockArea.qml
@@ -91,10 +91,10 @@ AppletItem {
return Qt.point(x, y)
}
function itemGlobalPos() {
var point = itemGlobalPoint()
- if (surfaceHost.Window.window) {
- point.x += surfaceHost.Window.window.x
- point.y += surfaceHost.Window.window.y
+ if (Window.window) {
+ point.x += Window.window.x
+ point.y += Window.window.y
}
return point
}--- a/panels/dock/package/main.qml
+++ b/panels/dock/package/main.qml
@@ -72,7 +72,7 @@ Window {
width: {
if (fashionDock.enabled) {
- return Math.max(1, fashionDock.effectiveShellWidth())
+ return Math.max(0, fashionDock.effectiveShellWidth())
}
return positionForAnimation === Dock.Top || positionForAnimation === Dock.Bottom ? -1 : dockSize |
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.
plugins in a carousel
remove/find)
index navigation
card area
plugins exist
Log: Added card-type plugin display area with carousel navigation in
dock
Influence:
feat: 为任务栏添加卡片类型插件支持
Log: 新增卡片类型插件显示区域，支持轮播导航
Influence: