fix: ensure preview icon will use icon from theme as fallback #1272
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
确保窗口预览图会使用来自图标主题的名称作为 fallback PMS: BUG-335563 Log:
|
[APPROVALNOTIFIER] This PR is NOT APPROVED This pull-request has been approved by: 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 |
Reviewer's guide (collapsed on small PRs)Reviewer's GuideReplaced the base64-only icon loader with a unified method that parses the input string, loads embedded base64 data if present, or falls back to a theme icon by name, with logging and transparent placeholder on failure. File-Level Changes
Tips and commandsInteracting with Sourcery
Customizing Your ExperienceAccess your dashboard to:
Getting Help
|
deepin pr auto review我对这段代码进行了仔细审查，以下是我的分析和改进建议： 1. 语法逻辑
2. 代码质量
3. 代码性能
4. 代码安全
5. 具体改进建议代码void X11WindowPreviewContainer::updatePreviewIconFromString(const QString &stringData)
{
// 支持两种格式：
// 1. base64编码的图片数据，格式为 "data:image/xxx;base64,xxxx"
// 2. 系统主题图标名称
QPixmap pix;
const QStringList strs = stringData.split("base64,", Qt::SkipEmptyParts);
if (strs.size() == 2) {
// 处理base64图片数据
QByteArray base64Data = strs.at(1).toLatin1();
// 验证base64数据有效性
if (base64Data.size() > MAX_ICON_DATA_SIZE) {
qCWarning(x11WindowPreview) << "Icon data too large, size:" << base64Data.size();
pix = createFallbackIcon();
goto setPixmap;
}
pix.loadFromData(QByteArray::fromBase64(base64Data));
if (pix.isNull()) {
qCWarning(x11WindowPreview) << "Failed to load icon from base64 data";
pix = createFallbackIcon();
}
} else {
// 处理主题图标名称
pix = QIcon::fromTheme(stringData, QIcon()).pixmap(PREVIEW_TITLE_HEIGHT, PREVIEW_TITLE_HEIGHT);
if (pix.isNull()) {
qCWarning(x11WindowPreview) << "Failed to load theme icon:" << stringData;
pix = createFallbackIcon();
}
}
setPixmap:
m_previewIcon->setPixmap(pix);
}
QPixmap X11WindowPreviewContainer::createFallbackIcon()
{
QPixmap icon(PREVIEW_TITLE_HEIGHT, PREVIEW_TITLE_HEIGHT);
icon.fill(Qt::transparent);
return icon;
}6. 其他建议
private:
static const int MAX_ICON_DATA_SIZE = 1024 * 1024; // 1MB
static const int PREVIEW_TITLE_HEIGHT = 24;这些改进将提高代码的健壮性、可维护性和安全性，同时保持良好的性能表现。 |
![sourcery-ai[bot]](https://avatars.githubusercontent.com/in/48477?s=60&v=4){kind=small}
There was a problem hiding this comment.
Hey there - I've reviewed your changes and they look great!
Prompt for AI Agents
Please address the comments from this code review:
## Individual Comments
### Comment 1
<location> `panels/dock/taskmanager/x11preview.cpp:766-774` </location>
<code_context>
{
- const QStringList strs = base64Data.split("base64,");
QPixmap pix;
+ const QStringList strs = stringData.split("base64,");
if (strs.size() == 2) {
+ // is base64 image data
</code_context>
<issue_to_address>
**suggestion:** Splitting on 'base64,' may not handle malformed or unexpected input robustly.
If 'base64,' is missing or appears multiple times, the split may not work as intended. Input validation or a more reliable parsing method is recommended.
```suggestion
QPixmap pix;
int base64Idx = stringData.indexOf("base64,");
if (base64Idx != -1) {
QString base64Part = stringData.mid(base64Idx + 7); // 7 = length of "base64,"
if (!base64Part.isEmpty()) {
QByteArray decoded = QByteArray::fromBase64(base64Part.toLatin1());
if (!decoded.isEmpty() && pix.loadFromData(decoded)) {
// Successfully loaded base64 image data
} else {
// Malformed base64 or failed to load, fallback to icon theme
pix = QIcon::fromTheme(stringData).pixmap(PREVIEW_TITLE_HEIGHT, PREVIEW_TITLE_HEIGHT);
}
} else {
// Empty base64 part, fallback to icon theme
pix = QIcon::fromTheme(stringData).pixmap(PREVIEW_TITLE_HEIGHT, PREVIEW_TITLE_HEIGHT);
}
} else {
// "base64," not found, treat as icon name from theme
pix = QIcon::fromTheme(stringData).pixmap(PREVIEW_TITLE_HEIGHT, PREVIEW_TITLE_HEIGHT);
}
```
</issue_to_address>Help me be more useful! Please click 👍 or 👎 on each comment and I'll use the feedback to improve your reviews.
Comment on lines
766
to
774
| QPixmap pix; | ||
| const QStringList strs = stringData.split("base64,"); | ||
| if (strs.size() == 2) { | ||
| // is base64 image data | ||
| pix.loadFromData(QByteArray::fromBase64(strs.at(1).toLatin1())); | ||
| } else { | ||
| // is (likely) icon name from theme | ||
| pix = QIcon::fromTheme(stringData).pixmap(PREVIEW_TITLE_HEIGHT, PREVIEW_TITLE_HEIGHT); | ||
| } |
There was a problem hiding this comment.
suggestion: Splitting on 'base64,' may not handle malformed or unexpected input robustly.
If 'base64,' is missing or appears multiple times, the split may not work as intended. Input validation or a more reliable parsing method is recommended.
Suggested change
| QPixmap pix; | |
| const QStringList strs = stringData.split("base64,"); | |
| if (strs.size() == 2) { | |
| // is base64 image data | |
| pix.loadFromData(QByteArray::fromBase64(strs.at(1).toLatin1())); | |
| } else { | |
| // is (likely) icon name from theme | |
| pix = QIcon::fromTheme(stringData).pixmap(PREVIEW_TITLE_HEIGHT, PREVIEW_TITLE_HEIGHT); | |
| } | |
| QPixmap pix; | |
| int base64Idx = stringData.indexOf("base64,"); | |
| if (base64Idx != -1) { | |
| QString base64Part = stringData.mid(base64Idx + 7); // 7 = length of "base64," | |
| if (!base64Part.isEmpty()) { | |
| QByteArray decoded = QByteArray::fromBase64(base64Part.toLatin1()); | |
| if (!decoded.isEmpty() && pix.loadFromData(decoded)) { | |
| // Successfully loaded base64 image data | |
| } else { | |
| // Malformed base64 or failed to load, fallback to icon theme | |
| pix = QIcon::fromTheme(stringData).pixmap(PREVIEW_TITLE_HEIGHT, PREVIEW_TITLE_HEIGHT); | |
| } | |
| } else { | |
| // Empty base64 part, fallback to icon theme | |
| pix = QIcon::fromTheme(stringData).pixmap(PREVIEW_TITLE_HEIGHT, PREVIEW_TITLE_HEIGHT); | |
| } | |
| } else { | |
| // "base64," not found, treat as icon name from theme | |
| pix = QIcon::fromTheme(stringData).pixmap(PREVIEW_TITLE_HEIGHT, PREVIEW_TITLE_HEIGHT); | |
| } |
18202781743
approved these changes
Sep 24, 2025
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.
确保窗口预览图会使用来自图标主题的名称作为 fallback
Summary by Sourcery
Improve the window preview icon loader to handle both base64 image data and named icons by theme, renaming the method and adding fallback behavior and logging
Enhancements: