Skip to content

fix: prevent itemSpacing override in setBackgroundType #671

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

Merged
18202781743 merged 1 commit into from
Jul 23, 2025
Merged

fix: prevent itemSpacing override in setBackgroundType #671

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
8 changes: 0 additions & 8 deletions src/widgets/dlistview.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -776,14 +776,6 @@ void DListView::setBackgroundType(DStyledItemDelegate::BackgroundType background
{
if (DStyledItemDelegate *d = qobject_cast<DStyledItemDelegate *>(itemDelegate())) {
d->setBackgroundType(backgroundType);

if (d->backgroundType() == DStyledItemDelegate::RoundedBackground) {
d->setItemSpacing(10);
} else if (d->backgroundType() == DStyledItemDelegate::ClipCornerBackground) {
d->setItemSpacing(1);
} else {
d->setItemSpacing(0);
}
}
}

Expand Down
27 changes: 20 additions & 7 deletions src/widgets/dstyleditemdelegate.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -516,10 +516,23 @@ class DStyledItemDelegatePrivate : public DCORE_NAMESPACE::DObjectPrivate
}
}


inline int itemSpacing() const
{
if (spacing >= 0)
return spacing;
const auto type = backgroundType & DStyledItemDelegate::BackgroundType_Mask;
if (type == DStyledItemDelegate::RoundedBackground)
return 10;
if (type == DStyledItemDelegate::ClipCornerBackground)
return 1;
return 0;
}

DStyledItemDelegate::BackgroundType backgroundType = DStyledItemDelegate::NoBackground;
QMargins margins;
QSize itemSize;
int itemSpacing = 0;
int spacing = -1;
QMap<QModelIndex, QList<QPair<QAction*, QRect>>> clickableActionMap;
QAction *pressedAction = nullptr;
QList<QPointer<QWidget>> lastWidgets;
Expand Down Expand Up @@ -1176,9 +1189,9 @@ QSize DStyledItemDelegate::sizeHint(const QStyleOptionViewItem &option, const QM
const QListView * lv = qobject_cast<const QListView*>(option.widget);
if (lv) {
if (lv->flow() == QListView::LeftToRight) {
size.rwidth() += d->itemSpacing;
size.rwidth() += d->itemSpacing();
} else {
size.rheight() += d->itemSpacing;
size.rheight() += d->itemSpacing();
}
}

Expand Down Expand Up @@ -1253,7 +1266,7 @@ int DStyledItemDelegate::spacing() const
{
D_DC(DStyledItemDelegate);

return d->itemSpacing;
return d->itemSpacing();
}

void DStyledItemDelegate::setBackgroundType(DStyledItemDelegate::BackgroundType type)
Expand Down Expand Up @@ -1297,7 +1310,7 @@ void DStyledItemDelegate::setItemSpacing(int spacing)
{
D_D(DStyledItemDelegate);

d->itemSpacing = spacing;
d->spacing = spacing;
}

void DStyledItemDelegate::initStyleOption(QStyleOptionViewItem *option, const QModelIndex &index) const
Expand Down Expand Up @@ -1353,9 +1366,9 @@ void DStyledItemDelegate::initStyleOption(QStyleOptionViewItem *option, const QM
const QListView * lv = qobject_cast<const QListView*>(option->widget);
if (lv) {
if (lv->flow() == QListView::LeftToRight) {
option->rect.adjust(0, 0, 0 - d->itemSpacing, 0);
option->rect.adjust(0, 0, 0 - d->itemSpacing(), 0);
} else {
option->rect.adjust(0, 0, 0, 0 - d->itemSpacing);
option->rect.adjust(0, 0, 0, 0 - d->itemSpacing());
}
if (lv->window() && lv->window()->isActiveWindow()) {
option->state |= QStyle::State_Active;
Expand Down
Loading