kde/dolphin
kde/dolphin
1
0
Fork 0
mirror of https://invent.kde.org/system/dolphin synced 2024-11-05 18:47:12 +00:00
Code Issues Projects Releases Packages Wiki Activity

Fix "truncated header" in Details View with non-Oxygen styles

Browse source 
The code for painting the "empty header" was inconsistent with the
headers of the other columns, which is probably the reason why the other
styles got confused

a) No QStyleOptionHeader is used
b) Even if an empty header must be drawn, the last column is drawn with
   the option QStyleOptionHeader::End.

According to Christoph, it still doesn't work with the Skulpture style,
but it seems that the patch does at least not make things worse.

BUG: 301800
FIXED-IN: 4.11.0
REVIEW: 111608
This commit is contained in:
Frank Reininghaus 2013-07-22 19:04:14 +02:00
parent 1bd7cd0ac7
commit 25f208ebe3
1 changed files with 24 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

30
dolphin/src/kitemviews/private/kitemlistheaderwidget.cpp
View file

@ -181,13 +181,6 @@ void KItemListHeaderWidget::paint(QPainter* painter, const QStyleOptionGraphicsI
++orderIndex; ++orderIndex;
} }
// Draw background without roles
QStyleOption opt;
opt.init(widget);
opt.rect = QRect(x, 0, size().width() - x, size().height());
opt.state |= QStyle::State_Horizontal;
style()->drawControl(QStyle::CE_HeaderEmptyArea, &opt, painter);
if (!m_movingRole.pixmap.isNull()) { if (!m_movingRole.pixmap.isNull()) {
Q_ASSERT(m_roleOperation == MoveRoleOperation); Q_ASSERT(m_roleOperation == MoveRoleOperation);
painter->drawPixmap(m_movingRole.x, 0, m_movingRole.pixmap); painter->drawPixmap(m_movingRole.x, 0, m_movingRole.pixmap);
@ -405,12 +398,21 @@ void KItemListHeaderWidget::paintRole(QPainter* painter,
} }
option.rect = rect.toRect(); option.rect = rect.toRect();
bool paintBackgroundForEmptyArea = false;
if (m_columns.count() == 1) { if (m_columns.count() == 1) {
option.position = QStyleOptionHeader::OnlyOneSection; option.position = QStyleOptionHeader::OnlyOneSection;
} else if (orderIndex == 0) { } else if (orderIndex == 0) {
option.position = QStyleOptionHeader::Beginning; option.position = QStyleOptionHeader::Beginning;
} else if (orderIndex == m_columns.count() - 1) { } else if (orderIndex == m_columns.count() - 1) {
// We are just painting the header for the last column. Check if there
// is some empty space to the right which needs to be filled.
if (rect.right() < size().width()) {
option.position = QStyleOptionHeader::Middle;
paintBackgroundForEmptyArea = true;
} else {
option.position = QStyleOptionHeader::End; option.position = QStyleOptionHeader::End;
}
} else { } else {
option.position = QStyleOptionHeader::Middle; option.position = QStyleOptionHeader::Middle;
} }
@ -420,6 +422,20 @@ void KItemListHeaderWidget::paintRole(QPainter* painter,
option.text = m_model->roleDescription(role); option.text = m_model->roleDescription(role);
style()->drawControl(QStyle::CE_Header, &option, painter, widget); style()->drawControl(QStyle::CE_Header, &option, painter, widget);
if (paintBackgroundForEmptyArea) {
option.state = QStyle::State_None | QStyle::State_Raised | QStyle::State_Horizontal;
option.section = m_columns.count();
option.sortIndicator = QStyleOptionHeader::None;
qreal backgroundRectX = rect.x() + rect.width();
QRectF backgroundRect(backgroundRectX, 0.0, size().width() - backgroundRectX, rect.height());
option.rect = backgroundRect.toRect();
option.position = QStyleOptionHeader::End;
option.text = QString();
style()->drawControl(QStyle::CE_Header, &option, painter, widget);
}
} }
void KItemListHeaderWidget::updatePressedRoleIndex(const QPointF& pos) void KItemListHeaderWidget::updatePressedRoleIndex(const QPointF& pos)