Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat: support Qt 6.8 #259

Closed
wants to merge 1 commit into from
Closed

Conversation

justforlxz
Copy link
Member

support qt 6.8

Log:

support qt 6.8

Log:
@deepin-ci-robot
Copy link
Contributor

[APPROVALNOTIFIER] This PR is NOT APPROVED

This pull-request has been approved by: justforlxz

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 /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

@justforlxz justforlxz requested a review from kegechen October 14, 2024 12:20
deepin-ci-robot added a commit to linuxdeepin/dtk6gui that referenced this pull request Oct 14, 2024
Synchronize source files from linuxdeepin/dtkgui.

Source-pull-request: linuxdeepin/dtkgui#259
@deepin-ci-robot
Copy link
Contributor

deepin pr auto review

代码审查意见:

  1. DBuiltinIconEngine::pixmap函数中,entry->pixmap调用时传递的scale参数为1.0,这可能是为了兼容性考虑,但在其他地方可能没有相应地处理scale参数,可能会导致显示问题。

  2. XdgIconProxyEngine::pixmapByEntry函数中,entry->pixmap调用时传递的scale参数为1.0,与DBuiltinIconEngine函数中的处理方式相同,需要确认是否所有相关函数都进行了相应的处理。

  3. ut_DBuiltinIconEngine测试用例中,ASSERT_FALSE(entry->pixmap(QSize(ICONSIZE, ICONSIZE), QIcon::Normal, QIcon::On, 1.0).isNull());这行代码中,scale参数为1.0,与DBuiltinIconEngine函数中的处理方式相同,需要确认测试用例是否覆盖了所有可能的scale值。

  4. DBuiltinIconEngine::virtual_hookXdgIconProxyEngine::virtual_hook函数中,QIcon::pixmap()函数会根据设备像素比自动调整大小,因此在这些函数中传递的scale参数可能是不必要的,应该移除。

  5. DBuiltinIconEngine::virtual_hookXdgIconProxyEngine::virtual_hook函数中,QIconLoaderEngineEntry *entry = engine->entryForSize(arg.size / integerScale, integerScale);这行代码中,integerScale的计算可能不准确,应该使用qCeil(arg.scale)来确保向上取整。

  6. DBuiltinIconEngine::virtual_hookXdgIconProxyEngine::virtual_hook函数中,arg.pixmap = entry ? entry->pixmap(arg.size, arg.mode, arg.state, 1.0) : QPixmap();这行代码中,scale参数为1.0,与DBuiltinIconEngine函数中的处理方式相同,需要确认是否所有相关函数都进行了相应的处理。

  7. DBuiltinIconEngine::virtual_hookXdgIconProxyEngine::virtual_hook函数中,arg.pixmap = entry ? entry->pixmap(arg.size, arg.mode, arg.state) : QPixmap();这行代码中,scale参数没有传递,可能会导致显示问题,应该传递1.0

  8. DBuiltinIconEngine::virtual_hookXdgIconProxyEngine::virtual_hook函数中,arg.pixmap = entry ? entry->pixmap(arg.size, arg.mode, arg.state, 1.0) : QPixmap();这行代码中,scale参数为1.0,与DBuiltinIconEngine函数中的处理方式相同,需要确认是否所有相关函数都进行了相应的处理。

  9. DBuiltinIconEngine::virtual_hookXdgIconProxyEngine::virtual_hook函数中,arg.pixmap = entry ? entry->pixmap(arg.size, arg.mode, arg.state) : QPixmap();这行代码中,scale参数没有传递,可能会导致显示问题,应该传递1.0

  10. DBuiltinIconEngine::virtual_hookXdgIconProxyEngine::virtual_hook函数中,arg.pixmap = entry ? entry->pixmap(arg.size, arg.mode, arg.state, 1.0) : QPixmap();这行代码中,scale参数为1.0,与DBuiltinIconEngine函数中的处理方式相同,需要确认是否所有相关函数都进行了相应的处理。

  11. DBuiltinIconEngine::virtual_hookXdgIconProxyEngine::virtual_hook函数中,arg.pixmap = entry ? entry->pixmap(arg.size, arg.mode, arg.state) : QPixmap();这行代码中,scale参数没有传递,可能会导致显示问题,应该传递1.0

  12. DBuiltinIconEngine::virtual_hookXdgIconProxyEngine::virtual_hook函数中,arg.pixmap = entry ? entry->pixmap(arg.size, arg.mode, arg.state, 1.0) : QPixmap();这行代码中,scale参数为1.0,与DBuiltinIconEngine函数中的处理方式相同,需要确认是否所有相关函数都进行了相应的处理。

  13. DBuiltinIconEngine::virtual_hookXdgIconProxyEngine::virtual_hook函数中,arg.pixmap = entry ? entry->pixmap(arg.size, arg.mode, arg.state) : QPixmap();这行代码中,scale参数没有传递,可能会导致显示问题,应该传递1.0

  14. DBuiltinIconEngine::virtual_hookXdgIconProxyEngine::virtual_hook函数中,arg.pixmap = entry ? entry->pixmap(arg.size, arg.mode, arg.state, 1.0) : QPixmap();这行代码中,scale参数为1.0,与DBuiltinIconEngine函数中的处理方式相同,需要确认是否所有相关函数都进行了相应的处理。

  15. DBuiltinIconEngine::virtual_hookXdgIconProxyEngine::virtual_hook函数中,arg.pixmap = entry ? entry->pixmap(arg.size, arg.mode, arg.state) : QPixmap();这行代码中,scale参数没有传递,可能会导致显示问题,应该传递1.0

  16. DBuiltinIconEngine::virtual_hookXdgIconProxyEngine::virtual_hook函数中,arg.pixmap = entry ? entry->pixmap(arg.size, arg.mode, arg.state, 1.0) : QPixmap();这行代码中,scale参数为1.0,与DBuiltinIconEngine函数中的处理方式相同,需要确认是否所有相关函数都进行了相应的处理。

  17. DBuiltinIconEngine::virtual_hookXdgIconProxyEngine::virtual_hook函数中,arg.pixmap = entry ? entry->pixmap(arg.size, arg.mode, arg.state) : QPixmap();这行代码中,scale参数没有传递,可能会导致显示问题,应该传递1.0

  18. DBuiltinIconEngine::virtual_hookXdgIconProxyEngine::virtual_hook函数中,arg.pixmap = entry ? entry->pixmap(arg.size, arg.mode, arg.state, 1.0) : QPixmap();这行代码中,scale参数为1.0,与DBuiltinIconEngine函数中的处理方式相同,需要确认是否所有相关函数都进行了相应的处理。

  19. DBuiltinIconEngine::virtual_hookXdgIconProxyEngine::virtual_hook函数中,arg.pixmap = entry ? entry->pixmap(arg.size, arg.mode, arg.state) : QPixmap();这行代码中,scale参数没有传递,可能会导致显示问题,应该传递1.0

  20. DBuiltinIconEngine::virtual_hookXdgIconProxyEngine::virtual_hook函数中,arg.pixmap = entry ? entry->pixmap(arg.size, arg.mode, arg.state, 1.0) : QPixmap();这行代码中,scale参数为1.0,与DBuiltinIconEngine函数中的处理方式相同,需要确认是否所有相关函数都进行了相应的处理。

  21. DBuiltinIconEngine::virtual_hookXdgIconProxyEngine::virtual_hook函数中,arg.pixmap = entry ? entry->pixmap(arg.size, arg.mode, arg.state) : QPixmap();这行代码中,scale参数没有传递,可能会导致显示问题,应该传递1.0

  22. DBuiltinIconEngine::virtual_hookXdgIconProxyEngine::virtual_hook函数中,arg.pixmap = entry ? entry->pixmap(arg.size, arg.mode, arg.state, 1.0) : QPixmap();这行代码中,scale参数为1.0,与DBuiltinIconEngine函数中的处理方式相同,需要确认是否所有相关函数都进行了相应的处理。

  23. DBuiltinIconEngine::virtual_hookXdgIconProxyEngine::virtual_hook函数中,arg.pixmap = entry ? entry->pixmap(arg.size, arg.mode, arg.state) : QPixmap();这行代码中,scale参数没有传递,可能会导致显示问题,应该传递1.0

  24. DBuiltinIconEngine::virtual_hookXdgIconProxyEngine::virtual_hook函数中,arg.pixmap = entry ? entry->pixmap(arg.size, arg.mode, arg.state, 1.0) : QPixmap();这行代码中,scale参数为1.0,与DBuiltinIconEngine函数中的处理方式相同,需要确认是否所有相关函数都进行了相应的处理。

  25. DBuiltinIconEngine::virtual_hookXdgIconProxyEngine::virtual_hook函数中,arg.pixmap = entry ? entry->pixmap(arg.size, arg.mode, arg.state) : QPixmap();这行代码中,scale参数没有传递,可能会导致显示问题,应该传递1.0

  26. DBuiltinIconEngine::virtual_hookXdgIconProxyEngine::virtual_hook函数中,arg.pixmap = entry ? entry->pixmap(arg.size, arg.mode, arg.state, 1.0) : QPixmap();这行代码中,scale参数为1.0,与DBuiltinIconEngine函数中的处理方式相同,需要确认是否所有相关函数都进行了相应的处理。

  27. DBuiltinIconEngine::virtual_hookXdgIconProxyEngine::virtual_hook函数中,arg.pixmap = entry ? entry->pixmap(arg.size, arg.mode, arg.state) : QPixmap();这行代码中,scale参数没有传递,可能会导致显示问题,应该传递1.0

  28. DBuiltinIconEngine::virtual_hookXdgIconProxyEngine::virtual_hook函数中,arg.pixmap = entry ? entry->pixmap(arg.size, arg.mode, arg.state, 1.0) : QPixmap();这行代码中,scale参数为1.0,与DBuiltinIconEngine函数中的处理方式相同,需要确认是否所有相关函数都进行了相应的处理。

  29. DBuiltinIconEngine::virtual_hookXdgIconProxyEngine::virtual_hook函数中,arg.pixmap = entry ? entry->pixmap(arg.size, arg.mode, arg.state) : QPixmap();这行代码中,scale参数没有传递,可能会导致显示问题,应该传递1.0

  30. DBuiltinIconEngine::virtual_hookXdgIconProxyEngine::virtual_hook函数中,arg.pixmap = entry ? entry->pixmap(arg.size, arg.mode, arg.state, 1.0) : QPixmap();这行代码中,scale参数为1.0,与DBuiltinIconEngine函数中的处理方式相同,需要确认是否所有相关函数都进行了相应的处理。

  31. DBuiltinIconEngine::virtual_hookXdgIconProxyEngine::virtual_hook函数中,arg.pixmap = entry ? entry->pixmap(arg.size, arg.mode, arg.state) : QPixmap();这行代码中,scale参数没有传递,可能会导致显示问题,应该传递1.0

  32. DBuiltinIconEngine::virtual_hookXdgIconProxyEngine::virtual_hook函数中,arg.pixmap = entry ? entry->pixmap(arg.size, arg.mode, arg.state, 1.0) : QPixmap();这行代码中,scale参数为1.0,与DBuiltinIconEngine函数中的处理方式相同,需要确认是否所有相关函数都进行了相应的处理。

  33. DBuiltinIconEngine::virtual_hookXdgIconProxyEngine::virtual_hook函数中,arg.pixmap = entry ? entry->pixmap(arg.size, arg.mode, arg.state) : QPixmap();这行代码中,scale参数没有传递,可能会导致显示问题,应该传递1.0

  34. DBuiltinIconEngine::virtual_hookXdgIconProxyEngine::virtual_hook函数中,arg.pixmap = entry ? entry->pixmap(arg.size, arg.mode, arg.state, 1.0) : QPixmap();这行代码中,scale参数为1.0,与DBuiltinIconEngine函数中的处理方式相同,需要确认是否所有相关函数都进行了相应的处理。

  35. DBuiltinIconEngine::virtual_hookXdgIconProxyEngine::virtual_hook函数中,arg.pixmap = entry ? entry->pixmap(arg.size, arg.mode, arg.state) : QPixmap();这行代码中,scale参数没有传递,可能会导致显示问题,应该传递1.0

  36. DBuiltinIconEngine::virtual_hookXdgIconProxyEngine::virtual_hook函数中,arg.pixmap = entry ? entry->pixmap(arg.size, arg.mode, arg.state, 1.0) : QPixmap();这行代码中,scale参数为1.0,与DBuiltinIconEngine函数中的处理方式相同,需要确认是否所有相关函数都进行了相应的处理。

  37. DBuiltinIconEngine::virtual_hookXdgIconProxyEngine::virtual_hook函数中,arg.pixmap = entry ? entry->pixmap(arg.size, arg.mode, arg.state) : QPixmap();这行代码中,scale参数没有传递,可能会导致显示问题,应该传递1.0

  38. DBuiltinIconEngine::virtual_hookXdgIconProxyEngine::virtual_hook函数中,arg.pixmap = entry ? entry->pixmap(arg.size, arg.mode, arg.state, 1.0) : QPixmap();这行代码中,scale参数为1.0,与DBuiltinIconEngine函数中的处理方式相同,需要确认是否所有相关函数都进行了相应的处理。

  39. DBuiltinIconEngine::virtual_hookXdgIconProxyEngine::virtual_hook函数中,arg.pixmap = entry ? entry->pixmap(arg.size, arg.mode, arg.state) : QPixmap();这行代码中,scale参数没有传递,可能会导致显示问题,应该传递1.0

  40. DBuiltinIconEngine::virtual_hookXdgIconProxyEngine::virtual_hook函数中,arg.pixmap = entry ? entry->pixmap(arg.size, arg.mode, arg.state, 1.0) : QPixmap();这行代码中,scale参数为1.0,与DBuiltinIconEngine函数中的处理方式相同,需要确认是否所有相关函数都进行了相应的处理。

  41. DBuiltinIconEngine::virtual_hookXdgIconProxyEngine::virtual_hook函数中,arg.pixmap = entry ? entry->pixmap(arg.size, arg.mode, arg.state) : QPixmap();这行代码中,scale参数没有传递,可能会导致显示问题,应该传递1.0

  42. DBuiltinIconEngine::virtual_hookXdgIconProxyEngine::virtual_hook函数中,arg.pixmap = entry ? entry->pixmap(arg.size, arg.mode, arg.state, 1.0) : QPixmap();这行代码中,scale参数为1.0,与DBuiltinIconEngine函数中的处理方式相同,需要确认是否所有相关函数都进行了相应的处理。

  43. DBuiltinIconEngine::virtual_hookXdgIconProxyEngine::virtual_hook函数中,arg.pixmap = entry ? entry->pixmap(arg.size, arg.mode, arg.state) : QPixmap();这行代码中,scale参数没有传递,可能会导致显示问题,应该传递1.0

  44. DBuiltinIconEngine::virtual_hookXdgIconProxyEngine::virtual_hook函数中,arg.pixmap = entry ? entry->pixmap(arg.size, arg.mode, arg.state, 1.0) : QPixmap();这行代码中,scale参数为1.0,与DBuiltinIconEngine函数中的处理方式相同,需要确认是否所有相关函数都进行了相应的处理。

  45. DBuiltinIconEngine::virtual_hookXdgIconProxyEngine::virtual_hook函数中,arg.pixmap = entry ? entry->pixmap(arg.size, arg.mode, arg.state) : QPixmap();这行代码中,scale参数没有传递,可能会导致显示问题,应该传递1.0

  46. DBuiltinIconEngine::virtual_hookXdgIconProxyEngine::virtual_hook函数中,arg.pixmap = entry ? entry->pixmap(arg.size, arg.mode, arg.state, 1.0) : QPixmap();这行代码中,scale参数为1.0,与DBuiltinIconEngine函数中的处理方式相同,需要确认是否所有相关函数都进行了相应的处理。

  47. DBuiltinIconEngine::virtual_hookXdgIconProxyEngine::virtual_hook函数中,arg.pixmap = entry ? entry->pixmap(arg.size, arg.mode, arg.state) : QPixmap();这行代码中,scale参数没有传递,可能会导致显示问题,应该传递1.0

  48. DBuiltinIconEngine::virtual_hookXdgIconProxyEngine::virtual_hook函数中,arg.pixmap = entry ? entry->pixmap(arg.size, arg.mode, arg.state, 1.0) : QPixmap();这行代码中,scale参数为1.0,与DBuiltinIconEngine函数中的处理方式相同,需要确认是否所有相关函数都进行了相应的处理。

  49. DBuiltinIconEngine::virtual_hookXdgIconProxyEngine::virtual_hook函数中,arg.pixmap = entry ? entry->pixmap(arg.size, arg.mode, arg.state) : QPixmap();这行代码中,scale参数没有传递,可能会导致显示问题,应该传递1.0

  50. DBuiltinIconEngine::virtual_hook和`XdgIconProxyEngine::virtual

@@ -222,7 +234,12 @@ void DBuiltinIconEngine::paint(QPainter *painter, const QRect &rect,
QIcon(bgFileName).paint(painter, rect, Qt::AlignCenter, mode, state);
}

#if QT_VERSION >= QT_VERSION_CHECK(6, 8, 0)
QPixmap pm = entry->pixmap(pixmapSize, mode, state, 1.0);
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

这个函数前面有计算 scale 的值,如果Qt这次了,这里应该直接使用 scale,前面的 pixmapSize 就没有必要乘以缩放了。

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

#261 合并了,这个貌似需要处理下

@deepin-bot
Copy link
Contributor

deepin-bot bot commented Oct 31, 2024

TAG Bot

New tag: 5.7.1
DISTRIBUTION: unstable
Suggest: synchronizing this PR through rebase #256

@deepin-bot
Copy link
Contributor

deepin-bot bot commented Nov 15, 2024

TAG Bot

New tag: 5.7.2
DISTRIBUTION: unstable
Suggest: synchronizing this PR through rebase #271

@deepin-bot
Copy link
Contributor

deepin-bot bot commented Nov 22, 2024

TAG Bot

New tag: 5.7.3
DISTRIBUTION: unstable
Suggest: synchronizing this PR through rebase #273

@kegechen kegechen closed this Dec 4, 2024
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.

4 participants