Skip to content

fix: add null check for DStyle cast in view delegates #926

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.

Sign up for GitHub

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

Closed
add-uos wants to merge 2 commits into from
+20 −5
Closed

fix: add null check for DStyle cast in view delegates #926

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
723161e
fix: add null check for DStyle cast in view delegates
add-uos Oct 26, 2026
f4c8243
chore: update SPDX copyright year for CI SPDX check
add-uos Oct 27, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 7 additions & 2 deletions deepin-devicemanager/src/Widget/DriverListView.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// Copyright (C) 2019 ~ 2020 UnionTech Software Technology Co.,Ltd
// Copyright (C) 2019-2026 ~ 2020 UnionTech Software Technology Co.,Ltd
// SPDX-FileCopyrightText: 2022 UnionTech Software Technology Co., Ltd.
//
// SPDX-License-Identifier: GPL-3.0-or-later
Expand Down Expand Up @@ -109,7 +109,12 @@ void DriverListView::drawRow(QPainter *painter, const QStyleOptionViewItem &opti

auto *style = dynamic_cast<DStyle *>(DApplication::style());

auto radius = style->pixelMetric(DStyle::PM_FrameRadius, &options);
auto radius = 8;
if (style) {
radius = style->pixelMetric(DStyle::PM_FrameRadius, &options);
} else {
qCWarning(appLog) << "Failed to get DStyle, using default radius";
}
//根据实际情况设置颜色，奇数行为灰色
auto palette = options.palette;
QBrush background;
Expand Down
9 changes: 7 additions & 2 deletions deepin-devicemanager/src/Widget/DriverListViewDelegate.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// Copyright (C) 2019 ~ 2020 UnionTech Software Technology Co.,Ltd
// Copyright (C) 2019-2026 ~ 2020 UnionTech Software Technology Co.,Ltd
// SPDX-FileCopyrightText: 2022 UnionTech Software Technology Co., Ltd.
//
// SPDX-License-Identifier: GPL-3.0-or-later
Expand Down Expand Up @@ -77,7 +77,12 @@ void DriverListViewDelegate::paint(QPainter *painter, const QStyleOptionViewItem
}
}
DStyle *style = dynamic_cast<DStyle *>(DApplication::style());
int margin = style->pixelMetric(DStyle::PM_ContentsMargins, &option);
int margin = 10;
if (style) {
margin = style->pixelMetric(DStyle::PM_ContentsMargins, &option);
} else {
qCWarning(appLog) << "Failed to get DStyle, using default margin";
}
//设置高亮文字色
DGuiApplicationHelper *dAppHelper = DGuiApplicationHelper::instance();
DPalette palette = dAppHelper->applicationPalette();
Expand Down
7 changes: 6 additions & 1 deletion deepin-devicemanager/src/Widget/logviewheaderview.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -187,7 +187,12 @@ int LogViewHeaderView::sectionSizeHint(int logicalIndex) const
QStyleOptionHeader option;
initStyleOption(&option);
DStyle *style = dynamic_cast<DStyle *>(DApplication::style());
int margin = style->pixelMetric(DStyle::PM_ContentsMargins, &option);
int margin = 10;
if (style) {
margin = style->pixelMetric(DStyle::PM_ContentsMargins, &option);
} else {
qCWarning(appLog) << "Failed to get DStyle, using default margin";
}

QFontMetrics fm(DApplication::font());
QString buf = model()->headerData(logicalIndex, Qt::Horizontal, Qt::DisplayRole).toString();
Expand Down
Loading