cherry-pick commits of v20 #691
Open
Conversation
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
deepin-ci-robot
added a commit
to linuxdeepin/dtk6widget
that referenced
this pull request
Oct 17, 2025
Synchronize source files from linuxdeepin/dtkwidget. Source-pull-request: linuxdeepin/dtkwidget#691
BLumia
previously approved these changes
Oct 17, 2025
|
/topic dtk-cpv20 |
|
Add topic: dtk-cpv20 successed. |
DListview在缩放后绘制悬浮背景会超出实际区域大约一个像素, 所以在绘制矩形时去掉边界一像素 Log: 修复控制中心一级菜单悬浮后离开有残影 Bug: https://pms.uniontech.com/bug-view-227911.html Influence: 所有使用DListview的应用 Change-Id: Ib76c1e28ce3a66c1d720ebc683cda8083f1a2fd4
根据设计师要求,控制中心部分对话框起提示作用,不允许改变大小. x11下, 提供了dxcb插件Dtk::Gui::DPlatformHandle 的DPlatformHandle::enableSystemResize() 可以禁止鼠标拖动改变窗口大小,而wayland下则不支持,所以在qt5platform-plugins中增加调用窗 管接口,在dtkwidget通过设置属性调用,使对话框不能拖动改变大小 Log: 解决wayland机器部分对话框可以改变大小 Bug: https://pms.uniontech.com/bug-view-231133.html Influence: 对话框大小调整 Change-Id: I8ba64d9ee2807851ac6cfdd6f7c8b62f0e2e60e5
根因: 给窗口设置mask的时候不会自动重绘，之前的绘制的残留部分没有消掉 解决: 在设置mask前触发重绘 Log: 修复DArrowRectangle在屏幕边缘处移动时其箭头有残影 Bug: https://pms.uniontech.com/bug-view-230623.html Influence: DArrowRectangle在屏幕边缘不会有残影 Change-Id: I33199747d0a634a70c5101e2fdba5d1db3e45a4d
根因: 1. 箭头在左边缘时x坐标为0，计算路径时自动视作没有偏移，导致位置跳变 2. 右边缘箭头位置计算有误，位置会有10px的偏移 3. 设置模糊不能实时更新，导致残影 解决: 1. 左侧边缘特殊判定，视作箭头有偏移 2. 换了一种计算方法，使用控件宽度一半减去当前屏幕鼠标到屏幕右边缘的距离 3. 暂时去掉模糊处理（wayland目前是纯白处理，改回模糊会有明显锯齿，保持现状） Log: 修复wayland下DArrowRectangle控件在屏幕左边缘箭头位置跳变、右边缘箭头位置错误、箭头区域有模糊残影 Bug: https://pms.uniontech.com/bug-view-230623.html Influence: 该控件在左边缘不会导致位置跳变，右边缘位置计算正确 Change-Id: Ieb37bf5965c46783a87af728f72bb541d356ad69
开发期间水印自定义文本被限制在16个字符之内，当用户 输出超过16字符时，无法继续键入。当插件中需要添加超 过16字符时，无法添加成功。因此需要重新调整字数限制 。目前将此限制去除。 Log: Influence: None Task: https://pms.uniontech.com/task-view-131849.html Change-Id: Ia9fcf3303f2c6cbab9fb5243948acc64a5635d39 (cherry picked from commit 81dfaa127a77b614c3d372fcf1fdc250952b7342) (cherry picked from commit 0f4637a2200518d1fa7f2cbd7d5a45e9dc3c7a4d) (cherry picked from commit 7955101141fb96409dcbeb2662739323e64c952f)
由于打印预览较特殊 需要可以调整窗口大小以改善预览体验 需要特殊处理开启大小调整特性 Log: 修复wayland协议打印预览弹窗的最大化按钮点击无响应 Bug: https://pms.uniontech.com/bug-view-237229.html Change-Id: Ic582bc8ab4e4d8f6e103f5cfa785982fbab73756
控件设置了固定高度,这样不仅无法适配紧凑模式,在语言文字改变时也无法自适应,需将其删除 Log: 修复打印预览部分控件未适配紧凑模式 Bug: https://pms.uniontech.com/bug-view-223275.html https://pms.uniontech.com/bug-view-223277.html Influence: 打印预览-紧凑模式 Change-Id: Iab9651a288d4fc526bd51028712e94886f79eaf6
对照设计图调整打印对话框UI Log: 修复打印预览对话框UI问题 Bug: https://pms.uniontech.com/bug-view-196923.html Influence: dtk打印预览对话框 Change-Id: I69e1e728e4356940484f20ca643998ef5d321814
分屏菜单中的图标为action, 只在悬浮和选中时图标引擎才会为其上色,normal状态下使用 图标的默认颜色,而设计给出的分屏菜单图标默认颜色为偏蓝的灰色,需要更改图标. 需要注意的是,设计给出的图标带有透明度,而图标引擎在鼠标悬浮时上的颜色也会 带有透明度(windowtext的颜色:0.7透明度的黑色),填充后图标本身的透明度还会生 效,会导致透明度叠加图标变灰的情况,所以将图标类型改为Icon类型,不随悬浮事件改变颜色。 Log: 修复dtk图标颜色更新后，分屏菜单里的图标颜色没有跟随改变 Bug: https://pms.uniontech.com/bug-view-231379.html Influence: 分屏菜单 Change-Id: I04f59fb950fecbd93730fa72b480287092c6fe0b
This reverts commit f962683. Reason for revert: 会导致x11下没有分屏菜单 Change-Id: I5805976ad386aa19f58834c35a8ddf1a969a0da9
wayland平台插件加入了对窗管设置关闭不可用的接口,dtitlebar的setDisableFlags未进行适配 Log: 修复华为机型数据备份进度显示界面，表头右键菜单中“关闭”按钮为可点击状态 Bug: https://pms.uniontech.com/bug-view-234997.html Influence: wayland下窗口关闭按钮的禁用(包括右键菜单中的关闭) Change-Id: Ib0abef200f4a8debdc24783a088ccc9c54e38d65
使用窗管接口设置不允许窗口关闭 Log: 复窗口设置不允许关闭时,还可通过窗口右键菜单来关闭窗口 Bug: https://pms.uniontech.com/bug-view-234997.html Influence: wayland窗口标题栏任务栏禁用后右键菜单是否禁用 Change-Id: I8045352d24a93ec82fc7d043ad15bc0c5e9fb924
https://gerrit.uniontech.com/c/qt5platform-plugins/+/232379 修改后,从标题栏按钮点击后拖动到按钮外,可以移动窗口,通过拦截鼠标移动事件解决 Log: 修复x11拖动窗口，鼠标放在最大化按钮，无分屏菜单 Bug: https://pms.uniontech.com/bug-view-242287.html Influence: 拖动窗口 Change-Id: I842acd0e2b071131668bad2fdbd978cf2fd4576a
由于在blurEffectWidget的paintEvent中绘制内边界,边界会属于窗口内,当内边界带透明度时,会透过窗口下的颜色,必须在blurEffectWidget的painterEvent之后再绘制边界 此需求需要应用适配,将DBlurEffectWidget替换为DBlurEffectWithBorderWidget即可(还需要在paintEvent中替换) Log: 新增一个含有内外边界的blurEffectWidget Task: https://pms.uniontech.com/task-view-330413.html Influence: 适配后的所有模糊窗口 Change-Id: I689b51810259494d57ecaf08190230d10f8837a6
优化新增类的 初始化,变量赋值顺序,新增常量等 Log: 优化新增的DBlurEffectWithBorderWidget Task: https://pms.uniontech.com/task-view-330413.html Influence: 适配后的所有模糊窗口 Change-Id: Ica08eb1fd8878aa2178f7409df142129970225c3
原本的逻辑是直接在文件全名后面添加.pdf ,现改为如果原本有后缀名则替换,否则直接添加 Log: 修复打印预览保存时文件名带上了原本的后缀名 Bug: https://pms.uniontech.com/bug-view-248039.html Influence: 打印预览保存文件时文件名 Change-Id: I8f498f8d6c065b325f5939315a10412cd1e0baa5
标题栏在主布局,而主布局设置了左右边距 Log: 修复开源软件弹窗关闭按钮没有贴边 Bug: https://pms.uniontech.com/bug-view-248259.html Influence: 关于对话框-开源软件声明 Change-Id: Icc0a873d27492210621f5a7210511cb57926bc0f
调整分屏菜单边界和投影 Log: 分屏菜单投影的样式问题 Bug: https://pms.uniontech.com/bug-view-247625.html Influence: 分屏菜单 Change-Id: I3f3ee422f041d259eba4906c2a0cc32a97b830b0
修复开源软件 链接字体 不跟随系统字体大小设置导致不协调 富文本中定义了链接字体大小,部分链接没绑定字体大小 Log: 修复开源软件 链接字体 不跟随系统字体大小设置导致不协调 Bug: https://pms.uniontech.com/bug-view-249085.html Influence: 关于对话框 Change-Id: I75e33de98819b3fa198b38b3542def0826fc404d
修复窗口边界不能跟随窗口主题实时变化 Log: 修复窗口边界不能跟随窗口主题实时变化 Bug: https://pms.uniontech.com/bug-view-243155.html Influence: 所有主窗口 Change-Id: Ib8a301f1623fb1363819a397fb3d4f0db3834eb5
显示密码按钮响应 Enter 和 Return 键盘事件 Log: Task: https://pms.uniontech.com/task-view-337287.html Influence: Change-Id: Ib77d26cd70f27c1e3ff3835ce800847c47ea84ce
拖动Tab之后会再走一次mainwindow的构造函数, 原先的窗口会析构 mainwindow里面绑定了主题和border的信号，但没写接受者，导致重新走构造时原来的连接没解绑 Log: 修复拖动终端Tab后再hover标题栏菜单，终端有概率直接崩溃 Task: https://pms.uniontech.com/task-view-338913.html Influence: 终端拖动Tab Change-Id: Ic6213fb843b77ff2970c050c01de4378b15f9c24
最佳性能模式没有圆角,从窗管获取的圆角值是无效的 Log: 修复模糊窗口最佳性能模式有内描边 Bug: https://pms.uniontech.com/bug-view-251555.html Influence: 模糊窗口内描边 Change-Id: Ib2758e903f0321609898f690ede7daef8b26cfe4
打印预览中的按照页码范围进行打印，不进行重置处理 Log: 打印预览中的按照页码范围进行打印，不进行重置处理 Task: https://pms.uniontech.com/task-view-340201.html Bug: https://pms.uniontech.com/bug-view-52353.html Influence: 打印预览页码范围 Change-Id: Ieeb6549d12e78c128f7640076e104a9e13f67884
编辑框错误提示控件增加模糊和阴影 Log: 编辑框错误提示控件增加模糊和阴影 Bug: https://pms.uniontech.com/bug-view-240243.html Influence: 编辑框错误提示控件 Change-Id: I6d01292e601c8772a2518551e28c9432f7f33356
滑动条默认支持鼠标点击后获得焦点，方便使用键盘进行微调 Log: 滑动条默认支持鼠标点击后获得焦点，方便使用键盘进行微调 Bug: https://pms.uniontech.com/bug-view-252911.html Influence: DTK 滑动条 Change-Id: Icb359940c9b3ad2897b6e111a24cc37ce5378c7e
This reverts commit 09d5934. Reason for revert: 应用自己处理 Change-Id: I57c157d9c63ae178fc87d542eda363f66c7c9eb8
点击时不直接给焦点, 而是点击后继续操作键盘的上,下,左,右才给焦点 Log: 调整DTK滑动控件的焦点逻辑 Bug: https://pms.uniontech.com/bug-view-256355.html Influence: DTK滑动条焦点逻辑 Change-Id: If8aeed400eeaa805eb664a9478acfcf8096a98db
部分打印机的ppd文件中ColorModel字段内容不以gray开始，修改成contains作为判断条件 Log: 修复通过图片查看器、相册、画图打开图片后使用色彩方式打印时打印结果为黑白的 Bug: https://pms.uniontech.com/bug-view-253183.html Influence: 使用hp-smart_tank_790打印机正常彩打 Change-Id: I576f50424e4108a276929ea668a18c16135a31b9
事件过滤器将事件直接转发给最上层的父类QWidget,导致其直接父类收不到事件 Log: 修复DPasswordEdit无focusChanged信号 Bug: https://pms.uniontech.com/bug-view-256737.html Influence: DTK密码输入框 Change-Id: I3ec9a68fb876adc010cf99ed57cee6681c5940a6
控件圆角和背景的圆角不相同,改为背景圆角使用控件的圆角，如果控件圆角未设置则使用默认值 Log: 修复DFloatingwidget 圆角异常 Bug: https://pms.uniontech.com/bug-view-261183.html Influence: DFloatingWidget控件 Change-Id: I7a1fd655f9a2f01335e399f3456d3bac02828a29
第一次加载时没有连接currentIndexChanged的信号，此时需要手动触发_q_ColorModeChange 后面连接了信号后，切换打印机时又会触发_q_printerChanged信号重新设置colorModeCombo， 为了避免多次触发currentIndexChanged信号，先block信号再手动触发 Log: 修复打印预览色彩默认配置为黑白实际打印为彩色的问题 Bug: https://pms.uniontech.com/bug-view-262893.html Influence: 按预览界面显示的选项打印黑白或彩色 Change-Id: I399498aea64b1d96159050008933fa23afae1294
修复打印PDF文件时逐份打印选项异常 Log: 修复文档查看器打印预览逐份打印不正常问题 Bug: https://pms.uniontech.com/bug-view-267279.html Influence: 打印PDF时正常逐份打印 Change-Id: I077c325080ac5cf12c955f0d311490a5d44c21fd
透明窗口的边界是窗口透明度加上一个补偿值得到的,当透明窗口完全不透明时,加上补偿值可能大于255,为无效值,Qt则会警告 Log: 修复任务栏完全不透明时，点击企业微信，任务栏日志中有大量报错 Task: https://pms.uniontech.com/task-view-359813.html Influence: 所有透明窗口 如通知中心,任务栏,启动器,剪切板 Change-Id: Ifec9207de75ac911e35c83231dd510d6da1f4e94
适配dde-watermark-plugin,添加对应头文件的简写文件 Log: 适配dde-watermark-plugin,添加对应头文件的简写文件 Influence: dde-watermark-plugin 1071编译 Bug: https://pms.uniontech.com/bug-view-285425.html Change-Id: I122c40711cf4557b9b921464466115075770dd64
当收到MouseButtonRelease后，如果watcher不是当前slider，needFocus置为false Log: Task: https://pms.uniontech.com/task-view-368951.html Influence: slider焦点 Change-Id: I141a886520092c3ffb4b21d9f9a46c61c5012007
打印预览添加默认色彩配置，并根据修改保存配置 Log: 打印预览添加默认色彩配置 Task: https://pms.uniontech.com/task-view-323445.html Influence: 打印预览色彩配置 Change-Id: I7dff41ffb11976aefa80280a660c54ef0253581b fix: 修改打印机彩色文案 打印机色彩设置改为彩色/黑白 Log: 修改打印机彩色文案 Bug: https://pms.uniontech.com/bug-view-246741.html Influence: 打印预览 Change-Id: I1b85e36f0af3525707099687c616948ab0d81497
打印机色彩设置改为彩色/黑白 Log: 更新翻译 Bug: https://pms.uniontech.com/bug-view-246741.html Influence: 打印预览 Change-Id: I759240cf14e8bdc11a384d73c57afd52b7bda603
deepin-ci-robot
added a commit
to linuxdeepin/dtk6widget
that referenced
this pull request
Oct 20, 2025
Synchronize source files from linuxdeepin/dtkwidget. Source-pull-request: linuxdeepin/dtkwidget#691
BLumia
approved these changes
Oct 29, 2025
|
[APPROVALNOTIFIER] This PR is NOT APPROVED This pull-request has been approved by: 18202781743, BLumia The full list of commands accepted by this bot can be found here.
Needs approval from an approver in each of these files:
Approvers can indicate their approval by writing |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
11 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.
Uh oh!
There was an error while loading. Please reload this page.