chore: 更改checkbox和radio实现方式为dci图标,增加动效 - #236
Merged
Merged
Conversation
deepin-ci-robot
added a commit
to linuxdeepin/qt6integration
that referenced
this pull request
Aug 5, 2024
Synchronize source files from linuxdeepin/qt5integration. Source-pull-request: linuxdeepin/qt5integration#236
Whale107
force-pushed
the
radio/checkbox
branch
from
August 5, 2024 07:41
271b4fe to
b53afb7
Compare
deepin-ci-robot
added a commit
to linuxdeepin/qt6integration
that referenced
this pull request
Aug 5, 2024
Synchronize source files from linuxdeepin/qt5integration. Source-pull-request: linuxdeepin/qt5integration#236
Whale107
force-pushed
the
radio/checkbox
branch
from
August 8, 2024 01:59
b53afb7 to
9f51ecf
Compare
deepin-ci-robot
added a commit
to linuxdeepin/qt6integration
that referenced
this pull request
Aug 8, 2024
Synchronize source files from linuxdeepin/qt5integration. Source-pull-request: linuxdeepin/qt5integration#236
kegechen
reviewed
Aug 9, 2024
| dciIconPlayer->setPalette(palette); | ||
| } | ||
| if (event->type() == QEvent::WindowActivate) { | ||
| dciIconPlayer->setIcon(icon); |
Contributor
There was a problem hiding this comment.
每个 if 里面都要 set icon and play ？
- 提供一个 getModeFromeventType 的方法
- seticon ，play(getModeFromeventType(event))
kegechen
reviewed
Aug 9, 2024
| return QRect(xOffset, yOffset, size, size); | ||
| } | ||
|
|
||
| static void checkDciIconEngine(bool checked, const QString &checkedIconName, const QString &uncheckedIconName |
Contributor
There was a problem hiding this comment.
这个函数名字有待商榷，和dciiconengine有什么关系？
参数也太多了，再改改吧
Contributor
There was a problem hiding this comment.
play(DDciIconPlayer *dciIconPlayer, icon, mode)..
Whale107
force-pushed
the
radio/checkbox
branch
from
August 12, 2024 05:32
9f51ecf to
07d1ebc
Compare
deepin-ci-robot
added a commit
to linuxdeepin/qt6integration
that referenced
this pull request
Aug 12, 2024
Synchronize source files from linuxdeepin/qt5integration. Source-pull-request: linuxdeepin/qt5integration#236
kegechen
reviewed
Aug 12, 2024
| DDciIcon icon = radioButton->isChecked() ? DDciIcon::fromTheme("radio_checked") : DDciIcon::fromTheme("radio_unchecked"); | ||
| DDciIconPalette palette; | ||
| palette.setHighlight(radioButton->palette().highlight().color()); | ||
|
|
Contributor
There was a problem hiding this comment.
auto player = dciIconPlayers.value(radioButton)
if (!player)
return DStyle::eventFilter(watched, event)
kegechen
reviewed
Aug 12, 2024
| break; | ||
| } | ||
| } | ||
| return false; |
Contributor
There was a problem hiding this comment.
return DStyle::eventFilter(watched, event)
kegechen
reviewed
Aug 12, 2024
| if (auto checkBox = qobject_cast<QCheckBox *>(watched)) { | ||
| DDciIcon icon = checkBox->isChecked() ? DDciIcon::fromTheme("checkbox_checked") : DDciIcon::fromTheme("checkbox_unchecked"); | ||
| DDciIconPalette palette; | ||
| palette.setHighlight(checkBox->palette().highlight().color()); |
Contributor
There was a problem hiding this comment.
DDciIconPalette::fromQPalette
Whale107
force-pushed
the
radio/checkbox
branch
from
August 12, 2024 06:05
07d1ebc to
218fa81
Compare
deepin-ci-robot
added a commit
to linuxdeepin/qt6integration
that referenced
this pull request
Aug 12, 2024
Synchronize source files from linuxdeepin/qt5integration. Source-pull-request: linuxdeepin/qt5integration#236
kegechen
approved these changes
Aug 12, 2024
kegechen
left a comment
kegechen
left a comment
Contributor
There was a problem hiding this comment.
测试一下，不同主题，不同高亮色下显示是否有异常
Contributor
|
[APPROVALNOTIFIER] This PR is NOT APPROVED This pull-request has been approved by: kegechen, Whale107 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 |
更改checkbox和radio实现方式为dci图标,增加动效 Log:
Whale107
force-pushed
the
radio/checkbox
branch
from
August 12, 2024 06:35
218fa81 to
c3d93c4
Compare
deepin-ci-robot
added a commit
to linuxdeepin/qt6integration
that referenced
this pull request
Aug 12, 2024
Synchronize source files from linuxdeepin/qt5integration. Source-pull-request: linuxdeepin/qt5integration#236
Contributor
deepin pr auto review关键摘要:
是否建议立即修改:
|
Whale107
added a commit
to Whale107/qt5integration
that referenced
this pull request
Sep 23, 2024
更改checkbox和radio实现方式为dci图标,增加动效 Log:
Whale107
added a commit
that referenced
this pull request
Sep 23, 2024
* feat: add animation for menu's selected backgroud Add a ChameleonAnimation class for the geometry translate animation. * chore: 更新滚动条样式,适配动画 (#233) 更新滚动条样式,适配动画 Log: * chore: add round and remove shadow for menu item add round and remove shadow for menu item Log: * chore: 更改checkbox和radio实现方式为dci图标,增加动效 (#236) 更改checkbox和radio实现方式为dci图标,增加动效 Log: * fix: adjust progressbar color (#237) adjust progressbar color Log: * fix: 修复在选中框之外hover 和点击也有动画的问题 (#238) checkbox和radio有框选区和文字区,应该只对框选区事件做处理 Log: --------- Co-authored-by: JiDe Zhang <zhangjide@deepin.org> Co-authored-by: wangfei <wangfei@deepin.org>
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.
更改checkbox和radio实现方式为dci图标,增加动效
Log: