Skip to content

feat: update window control icons and drawing logic#664

Merged
18202781743 merged 1 commit intolinuxdeepin:masterfrom
18202781743:master
Jun 18, 2025
Merged

feat: update window control icons and drawing logic#664
18202781743 merged 1 commit intolinuxdeepin:masterfrom
18202781743:master

Conversation

@18202781743
Copy link
Contributor

  1. Replaced window_normal.dci with window_restore.dci and
    window_quit_full.dci icons
  2. Updated icon references in dtk-icon-theme.qrc resource file
  3. Simplified title bar button drawing functions to use new icons
    instead of manual drawing
  4. Modified DStyle implementation to use the new icon assets
  5. Improved visual consistency by using pre-made icons rather than
    programmatic drawing

The changes were made to:

  • Standardize window control icons across the application
  • Replace programmatic drawing with higher quality vector icons
  • Make the UI more maintainable by using consistent icon assets
  • Prepare for future theme support by using icon resources

feat: 更新窗口控制图标和绘制逻辑

  1. 用 window_restore.dci 和 window_quit_full.dci 图标替换了
    window_normal.dci
  2. 更新了 dtk-icon-theme.qrc 资源文件中的图标引用
  3. 简化了标题栏按钮绘制函数,使用新图标替代手动绘制
  4. 修改了 DStyle 实现以使用新的图标资源
  5. 通过使用预制图标而非程序绘制提高了视觉一致性

这些修改的目的是:

  • 标准化应用程序中的窗口控制图标
  • 用更高质量的矢量图标替代程序绘制
  • 通过使用一致的图标资源提高UI可维护性
  • 通过使用图标资源为未来主题支持做准备

1. Replaced window_normal.dci with window_restore.dci and
window_quit_full.dci icons
2. Updated icon references in dtk-icon-theme.qrc resource file
3. Simplified title bar button drawing functions to use new icons
instead of manual drawing
4. Modified DStyle implementation to use the new icon assets
5. Improved visual consistency by using pre-made icons rather than
programmatic drawing

The changes were made to:
- Standardize window control icons across the application
- Replace programmatic drawing with higher quality vector icons
- Make the UI more maintainable by using consistent icon assets
- Prepare for future theme support by using icon resources

feat: 更新窗口控制图标和绘制逻辑

1. 用 window_restore.dci 和 window_quit_full.dci 图标替换了
window_normal.dci
2. 更新了 dtk-icon-theme.qrc 资源文件中的图标引用
3. 简化了标题栏按钮绘制函数,使用新图标替代手动绘制
4. 修改了 DStyle 实现以使用新的图标资源
5. 通过使用预制图标而非程序绘制提高了视觉一致性

这些修改的目的是:
- 标准化应用程序中的窗口控制图标
- 用更高质量的矢量图标替代程序绘制
- 通过使用一致的图标资源提高UI可维护性
- 通过使用图标资源为未来主题支持做准备
@18202781743 18202781743 requested review from BLumia and mhduiy June 18, 2025 06:05
deepin-ci-robot added a commit to linuxdeepin/dtk6widget that referenced this pull request Jun 18, 2025
Synchronize source files from linuxdeepin/dtkwidget.

Source-pull-request: linuxdeepin/dtkwidget#664
@deepin-ci-robot
Copy link
Contributor

deepin pr auto review

代码审查意见:

  1. 文件更改

    • window_normal.dci 文件被删除,window_restore.dciwindow_quit_full.dci 文件被添加。需要确认这些更改是否符合项目需求,以及这些新文件是否已经包含了必要的图标资源。
  2. 代码更改

    • drawTitleBarNormalButton 函数中的图标名称从 "window_normal" 更改为 "window_restore"。需要确认这个更改是否正确反映了业务逻辑或用户界面需求。
    • drawTitleQuitFullButton 函数中的绘制逻辑被完全移除,改为调用 drawTitleBarIcon 函数。需要验证这个更改是否正确,并且新的图标名称 "window_quit_full" 是否存在且正确。
  3. 代码质量

    • drawTitleQuitFullButton 函数中的绘制逻辑被移除,如果这个逻辑是必要的,那么移除可能会导致功能上的缺失。需要重新评估这个函数的用途,并决定是否需要保留或重构。
    • 如果 drawTitleBarIcon 函数的实现没有问题,那么这个更改是合理的。如果 drawTitleBarIcon 函数的实现有问题,那么需要修复它。
  4. 代码性能

    • 没有明显的性能问题,因为更改主要是关于图标名称的更改和绘制逻辑的移除。
  5. 代码安全

    • 没有涉及到安全性的更改,因为更改主要是关于图标和绘制逻辑的。

总体来说,这些更改看起来是为了更新图标和绘制逻辑,但需要确保这些更改是经过充分讨论和测试的,并且符合项目的需求和用户界面的预期。

@deepin-ci-robot
Copy link
Contributor

[APPROVALNOTIFIER] This PR is NOT APPROVED

This pull-request has been approved by: 18202781743, mhduiy

The full list of commands accepted by this bot can be found here.

Details Needs approval from an approver in each of these files:

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

@18202781743 18202781743 merged commit d377893 into linuxdeepin:master Jun 18, 2025
19 of 20 checks passed
18202781743 pushed a commit to linuxdeepin/dtk6widget that referenced this pull request Jun 18, 2025
Synchronize source files from linuxdeepin/dtkwidget.

Source-pull-request: linuxdeepin/dtkwidget#664
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants