cherry-pick commits of v20#350
Merged
18202781743 merged 2 commits intolinuxdeepin:masterfrom Nov 6, 2025
Merged
Conversation
Contributor
18202781743
commented
Oct 17, 2025
- fix: 修复DTK搜索框图标颜色不跟随主题变化
- fix: 没有匹配最佳尺寸的图标
deepin-ci-robot
added a commit
to linuxdeepin/dtk6gui
that referenced
this pull request
Oct 17, 2025
Synchronize source files from linuxdeepin/dtkgui. Source-pull-request: linuxdeepin/dtkgui#350
mhduiy
previously approved these changes
Oct 17, 2025
BLumia
previously approved these changes
Oct 17, 2025
Contributor
Author
|
/topic dtk-cpv20 |
Contributor
|
Add topic: dtk-cpv20 successed. |
deepin-ci-robot
added a commit
to linuxdeepin/dtk6gui
that referenced
this pull request
Oct 20, 2025
Synchronize source files from linuxdeepin/dtkgui. Source-pull-request: linuxdeepin/dtkgui#350
BLumia
approved these changes
Oct 29, 2025
Contributor
|
[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. DetailsNeeds approval from an approver in each of these files:Approvers can indicate their approval by writing |
from gerrit/develop/eagle in qt5integration. 466143d3a4cf40b0e95d4d1adf988a8b9c44eddd 9d60ce5c90cc7a7131434adb0a2bcc048f4e9515 2d88e02dfefcfc0b9e112e528d7586656923ba37 fix: 修复DTK搜索框图标颜色不跟随主题变化 图标引擎修改,在绘制pixmap前先填充颜色 Log: 修复DTK搜索框图标颜色不跟随主题变化 Bug: https://pms.uniontech.com/bug-view-200405.html https://pms.uniontech.com/bug-view-231425.html Influence: DTK内置图标绘制 Change-Id: Ib6869cdb331005794661dbd076c60cd5ae0f41df
3b5ab7a: fix: 没有匹配最佳尺寸的图标 原因:存在同名不同尺寸svg图标时,Scalable类型的图标会使用maxSize和minSize去找合适的图标 ,找到的不一定是最佳尺寸,绘图的时候会进行缩放,导致图标线条变粗/变细 解决方案:在使用entryForSize查找图标之前,先找一下是否有尺寸完全匹配的图标 Log: Influence: dtk内建图标(所有使用dtk内建图标的都会有影响) Change-Id: I158283516b067cc0a81654dee8c6657f54b9a56f
deepin-ci-robot
added a commit
to linuxdeepin/dtk6gui
that referenced
this pull request
Nov 6, 2025
Synchronize source files from linuxdeepin/dtkgui. Source-pull-request: linuxdeepin/dtkgui#350
Contributor
deepin pr auto review我来对这段代码进行审查:
auto* imageEntry = dynamic_cast<ImageEntry*>(entry);
if (!imageEntry) return pm;
总体来说,这次改动提高了代码的复用性和可维护性,但还有上述几点可以进一步改进。 |
18202781743
pushed a commit
to linuxdeepin/dtk6gui
that referenced
this pull request
Nov 6, 2025
Synchronize source files from linuxdeepin/dtkgui. Source-pull-request: linuxdeepin/dtkgui#350
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
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.