From 6fa1038a85f8e0da7c91b510cf01fe1bbcf37c0f Mon Sep 17 00:00:00 2001 From: Christian Ehrlicher Date: Tue, 8 Dec 2020 21:23:48 +0100 Subject: QHeaderView: respect the font role while calculating the elided text MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Amends 4d943846128118e1b9932a17ce6f977a0f4127a5: - The macOS style must now elide the text by it's own since it is no longer done by QHeaderView - Add documentation of QStyleOptionHeader::textElideMode - Remove unused variables from QHeaderView::initStyleOptionForIndex() Task-number: QTBUG-86426 Change-Id: I98fc6771c0cd56d6002390125ffbab1269f6dd39 Reviewed-by: Tor Arne Vestbø --- src/widgets/itemviews/qheaderview.cpp | 10 ---------- 1 file changed, 10 deletions(-) (limited to 'src/widgets/itemviews') diff --git a/src/widgets/itemviews/qheaderview.cpp b/src/widgets/itemviews/qheaderview.cpp index d6c9700ed3..1ddcad8fd0 100644 --- a/src/widgets/itemviews/qheaderview.cpp +++ b/src/widgets/itemviews/qheaderview.cpp @@ -2936,21 +2936,11 @@ void QHeaderView::initStyleOptionForIndex(QStyleOptionHeader *option, int logica opt.text = d->model->headerData(logicalIndex, d->orientation, Qt::DisplayRole).toString(); - int margin = 2 * style()->pixelMetric(QStyle::PM_HeaderMargin, nullptr, this); - - const Qt::Alignment headerArrowAlignment = static_cast(style()->styleHint(QStyle::SH_Header_ArrowAlignment, nullptr, this)); - const bool isHeaderArrowOnTheSide = headerArrowAlignment & Qt::AlignVCenter; - if (isSortIndicatorShown() && sortIndicatorSection() == logicalIndex && isHeaderArrowOnTheSide) - margin += style()->pixelMetric(QStyle::PM_HeaderMarkSize, nullptr, this); - const QVariant variant = d->model->headerData(logicalIndex, d->orientation, Qt::DecorationRole); opt.icon = qvariant_cast(variant); if (opt.icon.isNull()) opt.icon = qvariant_cast(variant); - if (!opt.icon.isNull()) // see CT_HeaderSection - margin += style()->pixelMetric(QStyle::PM_SmallIconSize, nullptr, this) + - style()->pixelMetric(QStyle::PM_HeaderMargin, nullptr, this); QVariant var = d->model->headerData(logicalIndex, d->orientation, Qt::FontRole); -- cgit v1.2.3