QPointF pos = ratingTextInfo->pos;
const Qt::Alignment align = ratingTextInfo->staticText.textOption().alignment();
if (align & Qt::AlignHCenter) {
- pos.rx() += (size().width() - m_rating.width()) / 2 - 2;
+ pos.rx() += (size().width() - m_rating.width() / m_rating.devicePixelRatioF()) / 2 - 2;
}
painter->drawPixmap(pos, m_rating);
}
{
const_cast<KStandardItemListWidget*>(this)->triggerCacheRefreshing();
- const int iconHeight = styleOption().iconSize;
-
+ const int widgetIconSize = iconSize();
int toggleSize = KIconLoader::SizeSmall;
- if (iconHeight >= KIconLoader::SizeEnormous) {
+ if (widgetIconSize >= KIconLoader::SizeEnormous) {
toggleSize = KIconLoader::SizeMedium;
- } else if (iconHeight >= KIconLoader::SizeLarge) {
+ } else if (widgetIconSize >= KIconLoader::SizeLarge) {
toggleSize = KIconLoader::SizeSmallMedium;
}
void KStandardItemListWidget::styleOptionChanged(const KItemListStyleOption& current,
const KItemListStyleOption& previous)
{
- Q_UNUSED(current)
- Q_UNUSED(previous)
+ KItemListWidget::styleOptionChanged(current, previous);
+
updateAdditionalInfoTextColor();
m_dirtyLayout = true;
}
m_roleEditor->setFocus();
}
+void KStandardItemListWidget::iconSizeChanged(int current, int previous)
+{
+ KItemListWidget::iconSizeChanged(current, previous);
+
+ invalidateIconCache();
+ triggerCacheRefreshing();
+ update();
+}
+
void KStandardItemListWidget::resizeEvent(QGraphicsSceneResizeEvent* event)
{
if (m_roleEditor) {
const QHash<QByteArray, QVariant> values = data();
const int expandedParentsCount = values.value("expandedParentsCount", 0).toInt();
if (expandedParentsCount >= 0) {
- const KItemListStyleOption& option = styleOption();
+ const int widgetIconSize = iconSize();
const qreal widgetHeight = size().height();
- const qreal inc = (widgetHeight - option.iconSize) / 2;
- const qreal x = expandedParentsCount * widgetHeight + inc;
+ const qreal inc = (widgetHeight - iconSize()) / 2;
+ const qreal x =
+ layoutDirection() == Qt::LeftToRight
+ ? expandedParentsCount * widgetHeight + inc
+ : size().width() - iconSize() - (expandedParentsCount * widgetHeight + inc);
const qreal y = inc;
const qreal xPadding = m_highlightEntireRow ? leadingPadding() : 0;
- m_expansionArea = QRectF(xPadding + x, y, option.iconSize, option.iconSize);
+ m_expansionArea = QRectF(xPadding + x, y, widgetIconSize, widgetIconSize);
return;
}
}
const KItemListStyleOption& option = styleOption();
const qreal padding = option.padding;
- const int maxIconWidth = iconOnTop ? widgetSize.width() - 2 * padding : option.iconSize;
- const int maxIconHeight = option.iconSize;
+ const int widgetIconSize = iconSize();
+ const int maxIconWidth = iconOnTop ? widgetSize.width() - 2 * padding : widgetIconSize;
+ const int maxIconHeight = widgetIconSize;
const QHash<QByteArray, QVariant> values = data();
} else {
// Center horizontally and vertically within the icon-area
const TextInfo* textInfo = m_textInfo.value("text");
- m_pixmapPos.setX(textInfo->pos.x() - 2.0 * padding
- - (scaledIconSize + m_scaledPixmapSize.width()) / 2.0);
+ const auto width = (scaledIconSize + m_scaledPixmapSize.width()) / 2.0;
+ const auto iPadding = 2.0 * padding;
+ const auto x = textInfo->pos.x();
+
+ const QHash<QByteArray, QVariant> values = data();
+ const int expandedParentsCount = values.value("expandedParentsCount", 0).toInt();
+ const int expansionOffset =
+ (m_layout == DetailsLayout) ?
+ size().height() + size().height() * expandedParentsCount :
+ 0;
+
+ m_pixmapPos.setX(layoutDirection() == Qt::LeftToRight
+ ? x - iPadding - width
+ : size().width() - iPadding - width - expansionOffset);
// Derive icon's vertical center from the center of the text frame, including
// any necessary adjustment if the font's midline is offset from the frame center
QString ret = m_customizedFontMetrics.elidedText(text.chopped(extensionLength),
Qt::ElideRight,
elidingWidth - extensionWidth);
+#if QT_VERSION < QT_VERSION_CHECK(6, 0, 0)
ret.append(text.rightRef(extensionLength));
+#else
+ ret.append(QStringView(text).right(extensionLength));
+#endif
return ret;
}
}
const KItemListStyleOption& option = styleOption();
const qreal padding = option.padding;
const qreal maxWidth = size().width() - 2 * padding;
- const qreal widgetHeight = size().height();
const qreal lineSpacing = m_customizedFontMetrics.lineSpacing();
// Initialize properties for the "text" role. It will be used as anchor
layout.endLayout();
// Use one line for each additional information
- const int additionalRolesCount = qMax(visibleRoles().count() - 1, 0);
nameTextInfo->staticText.setTextWidth(maxWidth);
- nameTextInfo->pos = QPointF(padding, widgetHeight -
- nameHeight -
- additionalRolesCount * lineSpacing -
- padding);
+ nameTextInfo->pos = QPointF(padding, iconSize() + 2 * padding);
m_textRect = QRectF(padding + (maxWidth - nameWidth) / 2,
nameTextInfo->pos.y(),
nameWidth,
requiredWidth = m_customizedFontMetrics.horizontalAdvance(elidedText);
} else if (role == "rating") {
// Use the width of the rating pixmap, because the rating text is empty.
- requiredWidth = m_rating.width();
+ requiredWidth = m_rating.width() / m_rating.devicePixelRatioF();
}
}
layout.endLayout();
textInfo->staticText.setTextWidth(maxWidth);
const QRectF textRect(padding + (maxWidth - requiredWidth) / 2, y, requiredWidth, lineSpacing);
- m_textRect |= textRect;
+
+ // Ignore empty roles. Avoids a text rect taller than the area that actually contains text.
+ if (!textRect.isEmpty()) {
+ m_textRect |= textRect;
+ }
y += lineSpacing;
}
const qreal widgetHeight = size().height();
const qreal lineSpacing = m_customizedFontMetrics.lineSpacing();
const qreal textLinesHeight = qMax(visibleRoles().count(), 1) * lineSpacing;
- const int scaledIconSize = (textLinesHeight < option.iconSize) ? widgetHeight - 2 * option.padding : option.iconSize;
qreal maximumRequiredTextWidth = 0;
- const qreal x = option.padding * 3 + scaledIconSize;
+ const qreal x = option.padding * 3 + iconSize();
qreal y = qRound((widgetHeight - textLinesHeight) / 2);
const qreal maxWidth = size().width() - x - option.padding;
for (const QByteArray& role : qAsConst(m_sortedVisibleRoles)) {
textInfo->staticText.setText(elidedText);
}
- textInfo->pos = QPointF(x, y);
+ if (layoutDirection() == Qt::LeftToRight) {
+ textInfo->pos = QPointF(x, y);
+ } else {
+ textInfo->pos = QPointF(x - size().height(), y);
+ }
textInfo->staticText.setTextWidth(maxWidth);
maximumRequiredTextWidth = qMax(maximumRequiredTextWidth, requiredWidth);
y += lineSpacing;
}
- m_textRect = QRectF(x - option.padding, 0, maximumRequiredTextWidth + 2 * option.padding, widgetHeight);
+ if (layoutDirection() == Qt::LeftToRight) {
+ m_textRect = QRectF(x - option.padding, 0, maximumRequiredTextWidth + 2 * option.padding, widgetHeight);
+ } else {
+ m_textRect = QRectF(x - option.padding - size().height(), 0, maximumRequiredTextWidth + 2 * option.padding, widgetHeight);
+ }
}
void KStandardItemListWidget::updateDetailsLayoutTextCache()
const QHash<QByteArray, QVariant> values = data();
const qreal widgetHeight = size().height();
- const int scaledIconSize = widgetHeight - 2 * option.padding;
const int fontHeight = m_customizedFontMetrics.height();
const qreal columnWidthInc = columnPadding(option);
- qreal firstColumnInc = scaledIconSize;
+
+ qreal firstColumnOffset = iconSize();
if (m_supportsItemExpanding) {
- firstColumnInc += (m_expansionArea.left() + m_expansionArea.right() + widgetHeight) / 2;
+ firstColumnOffset += (m_expansionArea.width() + widgetHeight) / 2;
} else {
- firstColumnInc += option.padding + leadingPadding();
+ firstColumnOffset += option.padding + leadingPadding();
}
- qreal x = firstColumnInc;
+ qreal x = firstColumnOffset;
const qreal y = qMax(qreal(option.padding), (widgetHeight - fontHeight) / 2);
for (const QByteArray& role : qAsConst(m_sortedVisibleRoles)) {
const qreal roleWidth = columnWidth(role);
qreal availableTextWidth = roleWidth - columnWidthInc;
+ const QHash<QByteArray, QVariant> values = data();
+ const int expandedParentsCount = values.value("expandedParentsCount", 0).toInt();
+ const int expansionOffset = size().height() * expandedParentsCount;
+
const bool isTextRole = (role == "text");
if (isTextRole) {
- availableTextWidth -= firstColumnInc - leadingPadding();
+ availableTextWidth -= firstColumnOffset - leadingPadding();
}
if (requiredWidth > availableTextWidth) {
TextInfo* textInfo = m_textInfo.value(role);
textInfo->staticText.setText(text);
- textInfo->pos = QPointF(x + columnWidthInc / 2, y);
+ textInfo->pos = QPointF(x - (layoutDirection() == Qt::LeftToRight ? 0 : firstColumnOffset), y);
+ if (layoutDirection() == Qt::LeftToRight) {
+ textInfo->pos.rx() += columnWidthInc/2 + expansionOffset;
+ } else {
+ textInfo->pos.rx() -= expansionOffset;
+ if (textInfo->pos.x() < iconSize()) {
+ textInfo->pos.rx() = iconSize();
+ }
+ }
x += roleWidth;
if (isTextRole) {
// The column after the name should always be aligned on the same x-position independent
// from the expansion-level shown in the name column
- x -= firstColumnInc - leadingPadding();
+ x -= firstColumnOffset - leadingPadding();
} else if (isRoleRightAligned(role)) {
textInfo->pos.rx() += roleWidth - requiredWidth - columnWidthInc;
}
void KStandardItemListWidget::drawSiblingsInformation(QPainter* painter)
{
const int siblingSize = size().height();
- const int x = (m_expansionArea.left() + m_expansionArea.right() - siblingSize) / 2;
- QRect siblingRect(x, 0, siblingSize, siblingSize);
+ const int x = (m_expansionArea.width() - siblingSize) / 2;
+
+ const QHash<QByteArray, QVariant> values = data();
+ const int expandedParentsCount = values.value("expandedParentsCount", 0).toInt();
+ const int expansionOffset = siblingSize * expandedParentsCount;
+
+ QRect siblingRect(
+ layoutDirection() == Qt::LeftToRight
+ ? x + expansionOffset
+ : size().width() - x - siblingSize - expansionOffset, 0, siblingSize, siblingSize);
bool isItemSibling = true;
const QBitArray siblings = siblingsInformation();
QStyleOption option;
+ option.direction = layoutDirection();
const auto normalColor = option.palette.color(normalTextColorRole());
const auto highlightColor = option.palette.color(expansionAreaHovered() ? QPalette::Highlight : normalTextColorRole());
for (int i = siblings.count() - 1; i >= 0; --i) {
style()->drawPrimitive(QStyle::PE_IndicatorBranch, &option, painter);
- siblingRect.translate(-siblingRect.width(), 0);
+ if (layoutDirection() == Qt::LeftToRight) {
+ siblingRect.translate(-siblingRect.width(), 0);
+ } else {
+ siblingRect.translate(siblingRect.width(), 0);
+ }
}
}
projects / dolphin.git / blobdiff