#include "kfileitemmodel.h"
#include "private/kfileitemclipboard.h"
#include "private/kitemlistroleeditor.h"
+#include "private/kitemviewsutils.h"
#include "private/kpixmapmodifier.h"
#include <KIconEffect>
#include <QGraphicsScene>
#include <QGraphicsSceneResizeEvent>
#include <QGraphicsView>
-#include <QGuiApplication>
#include <QPixmapCache>
#include <QStyleOption>
+#include <QVariantAnimation>
// #define KSTANDARDITEMLISTWIDGET_DEBUG
-KStandardItemListWidgetInformant::KStandardItemListWidgetInformant() :
- KItemListWidgetInformant()
+KStandardItemListWidgetInformant::KStandardItemListWidgetInformant()
+ : KItemListWidgetInformant()
{
}
{
}
-void KStandardItemListWidgetInformant::calculateItemSizeHints(QVector<std::pair<qreal, bool>>& logicalHeightHints, qreal& logicalWidthHint, const KItemListView* view) const
+void KStandardItemListWidgetInformant::calculateItemSizeHints(QVector<std::pair<qreal, bool>> &logicalHeightHints,
+ qreal &logicalWidthHint,
+ const KItemListView *view) const
{
- switch (static_cast<const KStandardItemListView*>(view)->itemLayout()) {
+ switch (static_cast<const KStandardItemListView *>(view)->itemLayout()) {
case KStandardItemListView::IconsLayout:
calculateIconsLayoutItemSizeHints(logicalHeightHints, logicalWidthHint, view);
break;
}
}
-qreal KStandardItemListWidgetInformant::preferredRoleColumnWidth(const QByteArray& role,
- int index,
- const KItemListView* view) const
+qreal KStandardItemListWidgetInformant::preferredRoleColumnWidth(const QByteArray &role, int index, const KItemListView *view) const
{
const QHash<QByteArray, QVariant> values = view->model()->data(index);
- const KItemListStyleOption& option = view->styleOption();
+ const KItemListStyleOption &option = view->styleOption();
const QString text = roleText(role, values);
qreal width = KStandardItemListWidget::columnPadding(option);
- const QFontMetrics& normalFontMetrics = option.fontMetrics;
+ const QFontMetrics &normalFontMetrics = option.fontMetrics;
const QFontMetrics linkFontMetrics(customizedFontForLinks(option.font));
if (role == "rating") {
width += KStandardItemListWidget::preferredRatingSize(option).width();
} else {
// If current item is a link, we use the customized link font metrics instead of the normal font metrics.
- const QFontMetrics& fontMetrics = itemIsLink(index, view) ? linkFontMetrics : normalFontMetrics;
+ const QFontMetrics &fontMetrics = itemIsLink(index, view) ? linkFontMetrics : normalFontMetrics;
width += fontMetrics.horizontalAdvance(text);
return width;
}
-QString KStandardItemListWidgetInformant::itemText(int index, const KItemListView* view) const
+QString KStandardItemListWidgetInformant::itemText(int index, const KItemListView *view) const
{
return view->model()->data(index).value("text").toString();
}
-bool KStandardItemListWidgetInformant::itemIsLink(int index, const KItemListView* view) const
+bool KStandardItemListWidgetInformant::itemIsLink(int index, const KItemListView *view) const
{
Q_UNUSED(index)
Q_UNUSED(view)
return false;
}
-QString KStandardItemListWidgetInformant::roleText(const QByteArray& role,
- const QHash<QByteArray, QVariant>& values) const
+QString KStandardItemListWidgetInformant::roleText(const QByteArray &role, const QHash<QByteArray, QVariant> &values) const
{
if (role == "rating") {
// Always use an empty text, as the rating is shown by the image m_rating.
return values.value(role).toString();
}
-QFont KStandardItemListWidgetInformant::customizedFontForLinks(const QFont& baseFont) const
+QFont KStandardItemListWidgetInformant::customizedFontForLinks(const QFont &baseFont) const
{
return baseFont;
}
-void KStandardItemListWidgetInformant::calculateIconsLayoutItemSizeHints(QVector<std::pair<qreal, bool>>& logicalHeightHints, qreal& logicalWidthHint, const KItemListView* view) const
+void KStandardItemListWidgetInformant::calculateIconsLayoutItemSizeHints(QVector<std::pair<qreal, bool>> &logicalHeightHints,
+ qreal &logicalWidthHint,
+ const KItemListView *view) const
{
- const KItemListStyleOption& option = view->styleOption();
- const QFont& normalFont = option.font;
+ const KItemListStyleOption &option = view->styleOption();
+ const QFont &normalFont = option.font;
const int additionalRolesCount = qMax(view->visibleRoles().count() - 1, 0);
const qreal itemWidth = view->itemSize().width();
}
// If the current item is a link, we use the customized link font instead of the normal font.
- const QFont& font = itemIsLink(index, view) ? linkFont : normalFont;
+ const QFont &font = itemIsLink(index, view) ? linkFont : normalFont;
+
+ const QString &text = KStringHandler::preProcessWrap(itemText(index, view));
- const QString& text = KStringHandler::preProcessWrap(itemText(index, view));
-
// Calculate the number of lines required for wrapping the name
qreal textHeight = 0;
QTextLayout layout(text, font);
logicalWidthHint = itemWidth;
}
-void KStandardItemListWidgetInformant::calculateCompactLayoutItemSizeHints(QVector<std::pair<qreal, bool>>& logicalHeightHints, qreal& logicalWidthHint, const KItemListView* view) const
+void KStandardItemListWidgetInformant::calculateCompactLayoutItemSizeHints(QVector<std::pair<qreal, bool>> &logicalHeightHints,
+ qreal &logicalWidthHint,
+ const KItemListView *view) const
{
- const KItemListStyleOption& option = view->styleOption();
- const QFontMetrics& normalFontMetrics = option.fontMetrics;
+ const KItemListStyleOption &option = view->styleOption();
+ const QFontMetrics &normalFontMetrics = option.fontMetrics;
const int additionalRolesCount = qMax(view->visibleRoles().count() - 1, 0);
- const QList<QByteArray>& visibleRoles = view->visibleRoles();
+ const QList<QByteArray> &visibleRoles = view->visibleRoles();
const bool showOnlyTextRole = (visibleRoles.count() == 1) && (visibleRoles.first() == "text");
const qreal maxWidth = option.maxTextWidth;
const qreal paddingAndIconWidth = option.padding * 4 + option.iconSize;
}
// If the current item is a link, we use the customized link font metrics instead of the normal font metrics.
- const QFontMetrics& fontMetrics = itemIsLink(index, view) ? linkFontMetrics : normalFontMetrics;
+ const QFontMetrics &fontMetrics = itemIsLink(index, view) ? linkFontMetrics : normalFontMetrics;
// For each row exactly one role is shown. Calculate the maximum required width that is necessary
// to show all roles without horizontal clipping.
if (showOnlyTextRole) {
maximumRequiredWidth = fontMetrics.horizontalAdvance(itemText(index, view));
} else {
- const QHash<QByteArray, QVariant>& values = view->model()->data(index);
- for (const QByteArray& role : visibleRoles) {
- const QString& text = roleText(role, values);
+ const QHash<QByteArray, QVariant> &values = view->model()->data(index);
+ for (const QByteArray &role : visibleRoles) {
+ const QString &text = roleText(role, values);
const qreal requiredWidth = fontMetrics.horizontalAdvance(text);
maximumRequiredWidth = qMax(maximumRequiredWidth, requiredWidth);
}
logicalWidthHint = height;
}
-void KStandardItemListWidgetInformant::calculateDetailsLayoutItemSizeHints(QVector<std::pair<qreal, bool>>& logicalHeightHints, qreal& logicalWidthHint, const KItemListView* view) const
+void KStandardItemListWidgetInformant::calculateDetailsLayoutItemSizeHints(QVector<std::pair<qreal, bool>> &logicalHeightHints,
+ qreal &logicalWidthHint,
+ const KItemListView *view) const
{
- const KItemListStyleOption& option = view->styleOption();
+ const KItemListStyleOption &option = view->styleOption();
const qreal height = option.padding * 2 + qMax(option.iconSize, option.fontMetrics.height());
logicalHeightHints.fill(std::make_pair(height, false));
logicalWidthHint = -1.0;
}
-KStandardItemListWidget::KStandardItemListWidget(KItemListWidgetInformant* informant, QGraphicsItem* parent) :
- KItemListWidget(informant, parent),
- m_textInfo(),
- m_isCut(false),
- m_isHidden(false),
- m_customizedFont(),
- m_customizedFontMetrics(m_customizedFont),
- m_isExpandable(false),
- m_supportsItemExpanding(false),
- m_dirtyLayout(true),
- m_dirtyContent(true),
- m_dirtyContentRoles(),
- m_layout(IconsLayout),
- m_pixmapPos(),
- m_pixmap(),
- m_scaledPixmapSize(),
- m_columnWidthSum(),
- m_iconRect(),
- m_hoverPixmap(),
- m_textRect(),
- m_sortedVisibleRoles(),
- m_expansionArea(),
- m_customTextColor(),
- m_additionalInfoTextColor(),
- m_overlay(),
- m_rating(),
- m_roleEditor(nullptr),
- m_oldRoleEditor(nullptr)
+KStandardItemListWidget::KStandardItemListWidget(KItemListWidgetInformant *informant, QGraphicsItem *parent)
+ : KItemListWidget(informant, parent)
+ , m_textInfo()
+ , m_isCut(false)
+ , m_isHidden(false)
+ , m_customizedFont()
+ , m_customizedFontMetrics(m_customizedFont)
+ , m_isExpandable(false)
+ , m_highlightEntireRow(false)
+ , m_supportsItemExpanding(false)
+ , m_dirtyLayout(true)
+ , m_dirtyContent(true)
+ , m_dirtyContentRoles()
+ , m_layout(IconsLayout)
+ , m_pixmapPos()
+ , m_pixmap()
+ , m_scaledPixmapSize()
+ , m_columnWidthSum()
+ , m_iconRect()
+ , m_hoverPixmap()
+ , m_textRect()
+ , m_sortedVisibleRoles()
+ , m_expansionArea()
+ , m_customTextColor()
+ , m_additionalInfoTextColor()
+ , m_overlay()
+ , m_rating()
+ , m_roleEditor(nullptr)
+ , m_oldRoleEditor(nullptr)
{
}
}
}
-KStandardItemListWidget::Layout KStandardItemListWidget::layout() const
+void KStandardItemListWidget::setHighlightEntireRow(bool highlightEntireRow)
{
- return m_layout;
-}
-
-void KStandardItemListWidget::setHighlightEntireRow(bool highlightEntireRow) {
if (m_highlightEntireRow != highlightEntireRow) {
m_highlightEntireRow = highlightEntireRow;
m_dirtyLayout = true;
}
}
-bool KStandardItemListWidget::highlightEntireRow() const {
+bool KStandardItemListWidget::highlightEntireRow() const
+{
return m_highlightEntireRow;
}
return m_supportsItemExpanding;
}
-void KStandardItemListWidget::paint(QPainter* painter, const QStyleOptionGraphicsItem* option, QWidget* widget)
+void KStandardItemListWidget::paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget)
{
- const_cast<KStandardItemListWidget*>(this)->triggerCacheRefreshing();
+ const_cast<KStandardItemListWidget *>(this)->triggerCacheRefreshing();
KItemListWidget::paint(painter, option, widget);
drawSiblingsInformation(painter);
}
- const KItemListStyleOption& itemListStyleOption = styleOption();
+ const KItemListStyleOption &itemListStyleOption = styleOption();
if (isHovered() && !m_pixmap.isNull()) {
if (hoverOpacity() < 1.0) {
/*
}
painter->setFont(m_customizedFont);
- painter->setPen(textColor());
- const TextInfo* textInfo = m_textInfo.value("text");
+ painter->setPen(textColor(*widget));
+ const TextInfo *textInfo = m_textInfo.value("text");
if (!textInfo) {
// It seems that we can end up here even if m_textInfo does not contain
painter->setFont(m_customizedFont);
for (int i = 1; i < m_sortedVisibleRoles.count(); ++i) {
- const TextInfo* textInfo = m_textInfo.value(m_sortedVisibleRoles[i]);
+ const TextInfo *textInfo = m_textInfo.value(m_sortedVisibleRoles[i]);
painter->drawStaticText(textInfo->pos, textInfo->staticText);
}
if (!m_rating.isNull()) {
- const TextInfo* ratingTextInfo = m_textInfo.value("rating");
+ const TextInfo *ratingTextInfo = m_textInfo.value("rating");
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);
}
QRectF KStandardItemListWidget::iconRect() const
{
- const_cast<KStandardItemListWidget*>(this)->triggerCacheRefreshing();
+ const_cast<KStandardItemListWidget *>(this)->triggerCacheRefreshing();
return m_iconRect;
}
QRectF KStandardItemListWidget::textRect() const
{
- const_cast<KStandardItemListWidget*>(this)->triggerCacheRefreshing();
+ const_cast<KStandardItemListWidget *>(this)->triggerCacheRefreshing();
return m_textRect;
}
// when having a quite large icon size but only one line of text. Still the
// focus rectangle should be shown as narrow as possible around the text.
- const_cast<KStandardItemListWidget*>(this)->triggerCacheRefreshing();
+ const_cast<KStandardItemListWidget *>(this)->triggerCacheRefreshing();
switch (m_layout) {
case CompactLayout: {
QRectF rect = m_textRect;
- const TextInfo* topText = m_textInfo.value(m_sortedVisibleRoles.first());
- const TextInfo* bottomText = m_textInfo.value(m_sortedVisibleRoles.last());
+ const TextInfo *topText = m_textInfo.value(m_sortedVisibleRoles.first());
+ const TextInfo *bottomText = m_textInfo.value(m_sortedVisibleRoles.last());
rect.setTop(topText->pos.y());
rect.setBottom(bottomText->pos.y() + bottomText->staticText.size().height());
return rect;
case DetailsLayout: {
QRectF rect = m_textRect;
- const TextInfo* textInfo = m_textInfo.value(m_sortedVisibleRoles.first());
+ const TextInfo *textInfo = m_textInfo.value(m_sortedVisibleRoles.first());
rect.setTop(textInfo->pos.y());
rect.setBottom(textInfo->pos.y() + textInfo->staticText.size().height());
- const KItemListStyleOption& option = styleOption();
+ const KItemListStyleOption &option = styleOption();
if (option.extendedSelectionRegion) {
const QString text = textInfo->staticText.text();
rect.setWidth(m_customizedFontMetrics.horizontalAdvance(text) + 2 * option.padding);
QRectF KStandardItemListWidget::selectionRect() const
{
- const_cast<KStandardItemListWidget*>(this)->triggerCacheRefreshing();
+ const_cast<KStandardItemListWidget *>(this)->triggerCacheRefreshing();
switch (m_layout) {
case IconsLayout:
QRectF adjustedIconRect = iconRect().adjusted(-padding, -padding, padding, padding);
QRectF result = adjustedIconRect | m_textRect;
if (m_highlightEntireRow) {
- result.setRight(m_columnWidthSum + leadingPadding());
+ result.setRight(m_columnWidthSum + sidePadding());
}
return result;
}
QRectF KStandardItemListWidget::expansionToggleRect() const
{
- const_cast<KStandardItemListWidget*>(this)->triggerCacheRefreshing();
+ const_cast<KStandardItemListWidget *>(this)->triggerCacheRefreshing();
return m_isExpandable ? m_expansionArea : QRectF();
}
QRectF KStandardItemListWidget::selectionToggleRect() const
{
- const_cast<KStandardItemListWidget*>(this)->triggerCacheRefreshing();
-
- const int iconHeight = styleOption().iconSize;
+ const_cast<KStandardItemListWidget *>(this)->triggerCacheRefreshing();
+ 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;
}
return QRectF(pos, QSizeF(toggleSize, toggleSize));
}
-QPixmap KStandardItemListWidget::createDragPixmap(const QStyleOptionGraphicsItem* option,
- QWidget* widget)
+QPixmap KStandardItemListWidget::createDragPixmap(const QStyleOptionGraphicsItem *option, QWidget *widget)
{
QPixmap pixmap = KItemListWidget::createDragPixmap(option, widget);
if (m_layout != DetailsLayout) {
// Only return the content of the text-column as pixmap
const int leftClip = m_pixmapPos.x();
- const TextInfo* textInfo = m_textInfo.value("text");
- const int rightClip = textInfo->pos.x() +
- textInfo->staticText.size().width() +
- 2 * styleOption().padding;
+ const TextInfo *textInfo = m_textInfo.value("text");
+ const int rightClip = textInfo->pos.x() + textInfo->staticText.size().width() + 2 * styleOption().padding;
QPixmap clippedPixmap(rightClip - leftClip + 1, pixmap.height());
clippedPixmap.fill(Qt::transparent);
return clippedPixmap;
}
+void KStandardItemListWidget::startActivateSoonAnimation(int timeUntilActivation)
+{
+ if (m_activateSoonAnimation) {
+ m_activateSoonAnimation->stop(); // automatically DeleteWhenStopped
+ }
+
+ m_activateSoonAnimation = new QVariantAnimation{this};
+ m_activateSoonAnimation->setStartValue(0.0);
+ m_activateSoonAnimation->setEndValue(1.0);
+ m_activateSoonAnimation->setDuration(timeUntilActivation);
+
+ const QVariant originalIconName{data()["iconName"]};
+ connect(m_activateSoonAnimation, &QVariantAnimation::valueChanged, this, [originalIconName, this](const QVariant &value) {
+ auto progress = value.toFloat();
+
+ QVariant wantedIconName;
+ if (progress < 0.333) {
+ wantedIconName = "folder-open";
+ } else if (progress < 0.666) {
+ wantedIconName = originalIconName;
+ } else {
+ wantedIconName = "folder-open";
+ }
+
+ QHash<QByteArray, QVariant> itemData{data()};
+ if (itemData["iconName"] != wantedIconName) {
+ itemData.insert("iconName", wantedIconName);
+ setData(itemData);
+ invalidateIconCache();
+ }
+ });
+
+ connect(m_activateSoonAnimation, &QObject::destroyed, this, [originalIconName, this]() {
+ QHash<QByteArray, QVariant> itemData{data()};
+ if (itemData["iconName"] == "folder-open") {
+ itemData.insert("iconName", originalIconName);
+ setData(itemData);
+ invalidateIconCache();
+ }
+ });
-KItemListWidgetInformant* KStandardItemListWidget::createInformant()
+ m_activateSoonAnimation->start(QAbstractAnimation::DeleteWhenStopped);
+}
+
+bool KStandardItemListWidget::isIconControlledByActivateSoonAnimation() const
+{
+ return m_activateSoonAnimation && data()["iconName"] == "folder-open";
+}
+
+KItemListWidgetInformant *KStandardItemListWidget::createInformant()
{
return new KStandardItemListWidgetInformant();
}
{
}
-bool KStandardItemListWidget::isRoleRightAligned(const QByteArray& role) const
+bool KStandardItemListWidget::isRoleRightAligned(const QByteArray &role) const
{
Q_UNUSED(role)
return false;
return false;
}
-QFont KStandardItemListWidget::customizedFont(const QFont& baseFont) const
+QFont KStandardItemListWidget::customizedFont(const QFont &baseFont) const
{
return baseFont;
}
return QPalette::Text;
}
-void KStandardItemListWidget::setTextColor(const QColor& color)
+void KStandardItemListWidget::setTextColor(const QColor &color)
{
if (color != m_customTextColor) {
m_customTextColor = color;
}
}
-QColor KStandardItemListWidget::textColor() const
+QColor KStandardItemListWidget::textColor(const QWidget &widget) const
{
if (!isSelected()) {
if (m_isHidden) {
}
}
- const QPalette::ColorGroup group = isActiveWindow() ? QPalette::Active : QPalette::Inactive;
+ const QPalette::ColorGroup group = isActiveWindow() && widget.hasFocus() ? QPalette::Active : QPalette::Inactive;
const QPalette::ColorRole role = isSelected() ? QPalette::HighlightedText : normalTextColorRole();
return styleOption().palette.color(group, role);
}
-void KStandardItemListWidget::setOverlay(const QPixmap& overlay)
+void KStandardItemListWidget::setOverlay(const QPixmap &overlay)
{
m_overlay = overlay;
m_dirtyContent = true;
return m_overlay;
}
-
-QString KStandardItemListWidget::roleText(const QByteArray& role,
- const QHash<QByteArray, QVariant>& values) const
+QString KStandardItemListWidget::roleText(const QByteArray &role, const QHash<QByteArray, QVariant> &values) const
{
- return static_cast<const KStandardItemListWidgetInformant*>(informant())->roleText(role, values);
+ return static_cast<const KStandardItemListWidgetInformant *>(informant())->roleText(role, values);
}
-void KStandardItemListWidget::dataChanged(const QHash<QByteArray, QVariant>& current,
- const QSet<QByteArray>& roles)
+void KStandardItemListWidget::dataChanged(const QHash<QByteArray, QVariant> ¤t, const QSet<QByteArray> &roles)
{
Q_UNUSED(current)
// The URL might have changed (i.e., if the sort order of the items has
// been changed). Therefore, the "is cut" state must be updated.
- KFileItemClipboard* clipboard = KFileItemClipboard::instance();
+ KFileItemClipboard *clipboard = KFileItemClipboard::instance();
const QUrl itemUrl = data().value("url").toUrl();
m_isCut = clipboard->isCut(itemUrl);
QSetIterator<QByteArray> it(dirtyRoles);
while (it.hasNext()) {
- const QByteArray& role = it.next();
+ const QByteArray &role = it.next();
m_dirtyContentRoles.insert(role);
}
}
-void KStandardItemListWidget::visibleRolesChanged(const QList<QByteArray>& current,
- const QList<QByteArray>& previous)
+void KStandardItemListWidget::visibleRolesChanged(const QList<QByteArray> ¤t, const QList<QByteArray> &previous)
{
Q_UNUSED(previous)
m_sortedVisibleRoles = current;
m_dirtyLayout = true;
}
-void KStandardItemListWidget::columnWidthChanged(const QByteArray& role,
- qreal current,
- qreal previous)
+void KStandardItemListWidget::columnWidthChanged(const QByteArray &role, qreal current, qreal previous)
{
Q_UNUSED(role)
Q_UNUSED(current)
m_dirtyLayout = true;
}
-void KStandardItemListWidget::leadingPaddingChanged(qreal padding) {
+void KStandardItemListWidget::sidePaddingChanged(qreal padding)
+{
Q_UNUSED(padding)
m_dirtyLayout = true;
}
-void KStandardItemListWidget::styleOptionChanged(const KItemListStyleOption& current,
- const KItemListStyleOption& previous)
+void KStandardItemListWidget::styleOptionChanged(const KItemListStyleOption ¤t, const KItemListStyleOption &previous)
{
- Q_UNUSED(current)
- Q_UNUSED(previous)
+ KItemListWidget::styleOptionChanged(current, previous);
+
updateAdditionalInfoTextColor();
m_dirtyLayout = true;
}
void KStandardItemListWidget::hoveredChanged(bool hovered)
{
- Q_UNUSED(hovered)
+ if (!hovered && m_activateSoonAnimation) {
+ m_activateSoonAnimation->stop(); // automatically DeleteWhenStopped
+ }
m_dirtyLayout = true;
}
m_dirtyContent = true;
}
-void KStandardItemListWidget::siblingsInformationChanged(const QBitArray& current, const QBitArray& previous)
+void KStandardItemListWidget::siblingsInformationChanged(const QBitArray ¤t, const QBitArray &previous)
{
Q_UNUSED(current)
Q_UNUSED(previous)
m_dirtyLayout = true;
}
-int KStandardItemListWidget::selectionLength(const QString& text) const
+int KStandardItemListWidget::selectionLength(const QString &text) const
{
return text.length();
}
-void KStandardItemListWidget::editedRoleChanged(const QByteArray& current, const QByteArray& previous)
+void KStandardItemListWidget::editedRoleChanged(const QByteArray ¤t, const QByteArray &previous)
{
Q_UNUSED(previous)
- QGraphicsView* parent = scene()->views()[0];
+ QGraphicsView *parent = scene()->views()[0];
if (current.isEmpty() || !parent || current != "text") {
if (m_roleEditor) {
Q_EMIT roleEditingCanceled(index(), current, data().value(current));
- disconnect(m_roleEditor, &KItemListRoleEditor::roleEditingCanceled,
- this, &KStandardItemListWidget::slotRoleEditingCanceled);
- disconnect(m_roleEditor, &KItemListRoleEditor::roleEditingFinished,
- this, &KStandardItemListWidget::slotRoleEditingFinished);
+ disconnect(m_roleEditor, &KItemListRoleEditor::roleEditingCanceled, this, &KStandardItemListWidget::slotRoleEditingCanceled);
+ disconnect(m_roleEditor, &KItemListRoleEditor::roleEditingFinished, this, &KStandardItemListWidget::slotRoleEditingFinished);
if (m_oldRoleEditor) {
m_oldRoleEditor->deleteLater();
Q_ASSERT(!m_roleEditor);
- const TextInfo* textInfo = m_textInfo.value("text");
+ const TextInfo *textInfo = m_textInfo.value("text");
m_roleEditor = new KItemListRoleEditor(parent);
m_roleEditor->setRole(current);
m_roleEditor->setTextCursor(cursor);
}
- connect(m_roleEditor, &KItemListRoleEditor::roleEditingCanceled,
- this, &KStandardItemListWidget::slotRoleEditingCanceled);
- connect(m_roleEditor, &KItemListRoleEditor::roleEditingFinished,
- this, &KStandardItemListWidget::slotRoleEditingFinished);
+ connect(m_roleEditor, &KItemListRoleEditor::roleEditingCanceled, this, &KStandardItemListWidget::slotRoleEditingCanceled);
+ connect(m_roleEditor, &KItemListRoleEditor::roleEditingFinished, this, &KStandardItemListWidget::slotRoleEditingFinished);
// Adjust the geometry of the editor
QRectF rect = roleEditingRect(current);
rect.setWidth(parent->width() - rect.left());
}
m_roleEditor->setGeometry(rect.toRect());
+ m_roleEditor->autoAdjustSize();
m_roleEditor->show();
m_roleEditor->setFocus();
}
-void KStandardItemListWidget::resizeEvent(QGraphicsSceneResizeEvent* event)
+void KStandardItemListWidget::iconSizeChanged(int current, int previous)
+{
+ KItemListWidget::iconSizeChanged(current, previous);
+
+ invalidateIconCache();
+ triggerCacheRefreshing();
+ update();
+}
+
+void KStandardItemListWidget::resizeEvent(QGraphicsSceneResizeEvent *event)
{
if (m_roleEditor) {
setEditedRole(QByteArray());
m_dirtyLayout = true;
}
-void KStandardItemListWidget::showEvent(QShowEvent* event)
+void KStandardItemListWidget::showEvent(QShowEvent *event)
{
KItemListWidget::showEvent(event);
// Listen to changes of the clipboard to mark the item as cut/uncut
- KFileItemClipboard* clipboard = KFileItemClipboard::instance();
+ KFileItemClipboard *clipboard = KFileItemClipboard::instance();
const QUrl itemUrl = data().value("url").toUrl();
m_isCut = clipboard->isCut(itemUrl);
- connect(clipboard, &KFileItemClipboard::cutItemsChanged,
- this, &KStandardItemListWidget::slotCutItemsChanged);
+ connect(clipboard, &KFileItemClipboard::cutItemsChanged, this, &KStandardItemListWidget::slotCutItemsChanged);
}
-void KStandardItemListWidget::hideEvent(QHideEvent* event)
+void KStandardItemListWidget::hideEvent(QHideEvent *event)
{
- disconnect(KFileItemClipboard::instance(), &KFileItemClipboard::cutItemsChanged,
- this, &KStandardItemListWidget::slotCutItemsChanged);
+ disconnect(KFileItemClipboard::instance(), &KFileItemClipboard::cutItemsChanged, this, &KStandardItemListWidget::slotCutItemsChanged);
KItemListWidget::hideEvent(event);
}
bool KStandardItemListWidget::event(QEvent *event)
{
- if (event->type() == QEvent::WindowDeactivate || event->type() == QEvent::WindowActivate
- || event->type() == QEvent::PaletteChange) {
+ if (event->type() == QEvent::WindowDeactivate || event->type() == QEvent::WindowActivate || event->type() == QEvent::PaletteChange) {
m_dirtyContent = true;
}
}
}
-void KStandardItemListWidget::slotRoleEditingCanceled(const QByteArray& role,
- const QVariant& value)
+void KStandardItemListWidget::slotRoleEditingCanceled(const QByteArray &role, const QVariant &value)
{
closeRoleEditor();
Q_EMIT roleEditingCanceled(index(), role, value);
setEditedRole(QByteArray());
}
-void KStandardItemListWidget::slotRoleEditingFinished(const QByteArray& role,
- const QVariant& value)
+void KStandardItemListWidget::slotRoleEditingFinished(const QByteArray &role, const QVariant &value)
{
closeRoleEditor();
Q_EMIT roleEditingFinished(index(), role, value);
m_isHidden = isHidden();
m_customizedFont = customizedFont(styleOption().font);
m_customizedFontMetrics = QFontMetrics(m_customizedFont);
- m_columnWidthSum = std::accumulate(m_sortedVisibleRoles.begin(), m_sortedVisibleRoles.end(),
- qreal(), [this](qreal sum, const auto &role){ return sum + columnWidth(role); });
+ m_columnWidthSum = std::accumulate(m_sortedVisibleRoles.begin(), m_sortedVisibleRoles.end(), qreal(), [this](qreal sum, const auto &role) {
+ return sum + columnWidth(role);
+ });
updateExpansionArea();
updateTextsCache();
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 inc = (widgetHeight - widgetIconSize) / 2;
const qreal x = expandedParentsCount * widgetHeight + inc;
const qreal y = inc;
- const qreal xPadding = m_highlightEntireRow ? leadingPadding() : 0;
- m_expansionArea = QRectF(xPadding + x, y, option.iconSize, option.iconSize);
+ const qreal xPadding = m_highlightEntireRow ? sidePadding() : 0;
+ m_expansionArea = QRectF(xPadding + x, y, widgetIconSize, widgetIconSize);
return;
}
}
const QSizeF widgetSize = size();
const bool iconOnTop = (m_layout == IconsLayout);
- const KItemListStyleOption& option = styleOption();
+ const KItemListStyleOption &option = styleOption();
const qreal padding = option.padding;
+ const qreal dpr = KItemViewsUtils::devicePixelRatio(this);
- 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();
bool updatePixmap = (m_pixmap.width() != maxIconWidth || m_pixmap.height() != maxIconHeight);
if (!updatePixmap && m_dirtyContent) {
- updatePixmap = m_dirtyContentRoles.isEmpty()
- || m_dirtyContentRoles.contains("iconPixmap")
- || m_dirtyContentRoles.contains("iconName")
- || m_dirtyContentRoles.contains("iconOverlays");
+ updatePixmap = m_dirtyContentRoles.isEmpty() || m_dirtyContentRoles.contains("iconPixmap") || m_dirtyContentRoles.contains("iconName")
+ || m_dirtyContentRoles.contains("iconOverlays");
}
if (updatePixmap) {
int sequenceIndex = hoverSequenceIndex();
- if (values.contains("hoverSequencePixmaps")) {
+ if (values.contains("hoverSequencePixmaps") && !isIconControlledByActivateSoonAnimation()) {
// Use one of the hover sequence pixmaps instead of the default
// icon pixmap.
}
}
- const int loadedIndex = qMax(qMin(sequenceIndex, pixmaps.size()-1), 0);
+ const int loadedIndex = qMax(qMin(sequenceIndex, pixmaps.size() - 1), 0);
if (loadedIndex != 0) {
m_pixmap = pixmaps[loadedIndex];
}
}
- if (m_pixmap.isNull()) {
+ if (m_pixmap.isNull() && !isIconControlledByActivateSoonAnimation()) {
m_pixmap = values["iconPixmap"].value<QPixmap>();
}
iconName = QStringLiteral("unknown");
}
const QStringList overlays = values["iconOverlays"].toStringList();
- m_pixmap = pixmapForIcon(iconName, overlays, maxIconHeight, m_layout != IconsLayout && isActiveWindow() && isSelected() ? QIcon::Selected : QIcon::Normal);
+ const bool hasFocus = scene()->views()[0]->parentWidget()->hasFocus();
+ m_pixmap = pixmapForIcon(iconName,
+ overlays,
+ maxIconHeight,
+ m_layout != IconsLayout && isActiveWindow() && isSelected() && hasFocus ? QIcon::Selected : QIcon::Normal);
} else if (m_pixmap.width() / m_pixmap.devicePixelRatio() != maxIconWidth || m_pixmap.height() / m_pixmap.devicePixelRatio() != maxIconHeight) {
// A custom pixmap has been applied. Assure that the pixmap
// is scaled to the maximum available size.
- KPixmapModifier::scale(m_pixmap, QSize(maxIconWidth, maxIconHeight) * qApp->devicePixelRatio());
+ KPixmapModifier::scale(m_pixmap, QSize(maxIconWidth, maxIconHeight) * dpr);
}
if (m_pixmap.isNull()) {
}
if (m_isCut) {
- KIconEffect* effect = KIconLoader::global()->iconEffect();
+ KIconEffect *effect = KIconLoader::global()->iconEffect();
m_pixmap = effect->apply(m_pixmap, KIconLoader::Desktop, KIconLoader::DisabledState);
}
int scaledIconSize = 0;
if (iconOnTop) {
- const TextInfo* textInfo = m_textInfo.value("text");
+ const TextInfo *textInfo = m_textInfo.value("text");
scaledIconSize = static_cast<int>(textInfo->pos.y() - 2 * padding);
} else {
const int textRowsCount = (m_layout == CompactLayout) ? visibleRoles().count() : 1;
const qreal requiredTextHeight = textRowsCount * m_customizedFontMetrics.height();
- scaledIconSize = (requiredTextHeight < maxIconHeight) ?
- widgetSize.height() - 2 * padding : maxIconHeight;
+ scaledIconSize = (requiredTextHeight < maxIconHeight) ? widgetSize.height() - 2 * padding : maxIconHeight;
}
const int maxScaledIconWidth = iconOnTop ? widgetSize.width() - 2 * padding : scaledIconSize;
const int maxScaledIconHeight = scaledIconSize;
m_scaledPixmapSize = m_pixmap.size();
- m_scaledPixmapSize.scale(maxScaledIconWidth * qApp->devicePixelRatio(), maxScaledIconHeight * qApp->devicePixelRatio(), Qt::KeepAspectRatio);
- m_scaledPixmapSize = m_scaledPixmapSize / qApp->devicePixelRatio();
+ m_scaledPixmapSize.scale(maxScaledIconWidth * dpr, maxScaledIconHeight * dpr, Qt::KeepAspectRatio);
+ m_scaledPixmapSize = m_scaledPixmapSize / dpr;
if (iconOnTop) {
// Center horizontally and align on bottom within the icon-area
m_pixmapPos.setY(padding + scaledIconSize - m_scaledPixmapSize.height());
} 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 TextInfo *textInfo = m_textInfo.value("text");
+ if (QApplication::isRightToLeft() && m_layout == CompactLayout) {
+ m_pixmapPos.setX(size().width() - padding - (scaledIconSize + m_scaledPixmapSize.width()) / 2.0);
+ } else {
+ m_pixmapPos.setX(textInfo->pos.x() - 2.0 * padding - (scaledIconSize + m_scaledPixmapSize.width()) / 2.0);
+ }
// 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
- const qreal midlineShift = m_customizedFontMetrics.height() / 2.0
- - m_customizedFontMetrics.descent()
- - m_customizedFontMetrics.capHeight() / 2.0;
+ const qreal midlineShift = m_customizedFontMetrics.height() / 2.0 - m_customizedFontMetrics.descent() - m_customizedFontMetrics.capHeight() / 2.0;
m_pixmapPos.setY(m_textRect.center().y() + midlineShift - m_scaledPixmapSize.height() / 2.0);
-
}
- m_iconRect = QRectF(m_pixmapPos, QSizeF(m_scaledPixmapSize));
+ if (m_layout == IconsLayout) {
+ m_iconRect = QRectF(m_pixmapPos, QSizeF(m_scaledPixmapSize));
+ } else {
+ const qreal widthOffset = widgetIconSize - m_scaledPixmapSize.width();
+ const qreal heightOffset = widgetIconSize - m_scaledPixmapSize.height();
+ const QPointF squareIconPos(m_pixmapPos.x() - 0.5 * widthOffset, m_pixmapPos.y() - 0.5 * heightOffset);
+ const QSizeF squareIconSize(widgetIconSize, widgetIconSize);
+ m_iconRect = QRectF(squareIconPos, squareIconSize);
+ }
// Prepare the pixmap that is used when the item gets hovered
if (isHovered()) {
m_hoverPixmap = m_pixmap;
- KIconEffect* effect = KIconLoader::global()->iconEffect();
+ KIconEffect *effect = KIconLoader::global()->iconEffect();
// In the KIconLoader terminology, active = hover.
if (effect->hasEffect(KIconLoader::Desktop, KIconLoader::ActiveState)) {
m_hoverPixmap = effect->apply(m_pixmap, KIconLoader::Desktop, KIconLoader::ActiveState);
textOption.setAlignment(Qt::AlignHCenter);
break;
case CompactLayout:
+ textOption.setAlignment(QApplication::isRightToLeft() ? Qt::AlignRight : Qt::AlignLeft);
+ textOption.setWrapMode(QTextOption::NoWrap);
+ break;
case DetailsLayout:
textOption.setAlignment(Qt::AlignLeft);
textOption.setWrapMode(QTextOption::NoWrap);
qDeleteAll(m_textInfo);
m_textInfo.clear();
for (int i = 0; i < m_sortedVisibleRoles.count(); ++i) {
- TextInfo* textInfo = new TextInfo();
+ TextInfo *textInfo = new TextInfo();
textInfo->staticText.setTextFormat(Qt::PlainText);
textInfo->staticText.setPerformanceHint(QStaticText::AggressiveCaching);
textInfo->staticText.setTextOption(textOption);
}
switch (m_layout) {
- case IconsLayout: updateIconsLayoutTextCache(); break;
- case CompactLayout: updateCompactLayoutTextCache(); break;
- case DetailsLayout: updateDetailsLayoutTextCache(); break;
- default: Q_ASSERT(false); break;
+ case IconsLayout:
+ updateIconsLayoutTextCache();
+ break;
+ case CompactLayout:
+ updateCompactLayoutTextCache();
+ break;
+ case DetailsLayout:
+ updateDetailsLayoutTextCache();
+ break;
+ default:
+ Q_ASSERT(false);
+ break;
}
- const TextInfo* ratingTextInfo = m_textInfo.value("rating");
+ const TextInfo *ratingTextInfo = m_textInfo.value("rating");
if (ratingTextInfo) {
// The text of the rating-role has been set to empty to get
// replaced by a rating-image showing the rating as stars.
- const KItemListStyleOption& option = styleOption();
+ const KItemListStyleOption &option = styleOption();
QSizeF ratingSize = preferredRatingSize(option);
- const qreal availableWidth = (m_layout == DetailsLayout)
- ? columnWidth("rating") - columnPadding(option)
- : size().width();
+ const qreal availableWidth = (m_layout == DetailsLayout) ? columnWidth("rating") - columnPadding(option) : size().width();
if (ratingSize.width() > availableWidth) {
ratingSize.rwidth() = availableWidth;
}
- const qreal dpr = qApp->devicePixelRatio();
+ const qreal dpr = KItemViewsUtils::devicePixelRatio(this);
m_rating = QPixmap(ratingSize.toSize() * dpr);
m_rating.setDevicePixelRatio(dpr);
m_rating.fill(Qt::transparent);
const auto extensionWidth = m_customizedFontMetrics.horizontalAdvance(text.right(extensionLength));
if (elidingWidth > extensionWidth && extensionLength < 6 && (float(extensionWidth) / float(elidingWidth)) < 0.3) {
// if we have room to display the file extension and the extension is not too long
- QString ret = m_customizedFontMetrics.elidedText(text.chopped(extensionLength),
- Qt::ElideRight,
- elidingWidth - extensionWidth);
+ 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;
}
}
- return m_customizedFontMetrics.elidedText(text,Qt::ElideRight,
- elidingWidth);
+ return m_customizedFontMetrics.elidedText(text, Qt::ElideRight, elidingWidth);
+}
+
+QString KStandardItemListWidget::escapeString(const QString &text) const
+{
+ QString escaped(text);
+
+ const QChar returnSymbol(0x21b5);
+ escaped.replace('\n', returnSymbol);
+
+ return escaped;
}
void KStandardItemListWidget::updateIconsLayoutTextCache()
const QHash<QByteArray, QVariant> values = data();
- const KItemListStyleOption& option = styleOption();
+ 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
// for initializing the position of the other roles.
- TextInfo* nameTextInfo = m_textInfo.value("text");
- const QString nameText = KStringHandler::preProcessWrap(values["text"].toString());
+ TextInfo *nameTextInfo = m_textInfo.value("text");
+ const QString nameText = KStringHandler::preProcessWrap(escapeString(values["text"].toString()));
nameTextInfo->staticText.setText(nameText);
// Calculate the number of lines required for the name and the required width
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);
- m_textRect = QRectF(padding + (maxWidth - nameWidth) / 2,
- nameTextInfo->pos.y(),
- nameWidth,
- nameHeight);
+ nameTextInfo->pos = QPointF(padding, iconSize() + 2 * padding);
+ m_textRect = QRectF(padding + (maxWidth - nameWidth) / 2, nameTextInfo->pos.y(), nameWidth, nameHeight);
// Calculate the position for each additional information
qreal y = nameTextInfo->pos.y() + nameHeight;
- for (const QByteArray& role : qAsConst(m_sortedVisibleRoles)) {
+ for (const QByteArray &role : std::as_const(m_sortedVisibleRoles)) {
if (role == "text") {
continue;
}
const QString text = roleText(role, values);
- TextInfo* textInfo = m_textInfo.value(role);
+ TextInfo *textInfo = m_textInfo.value(role);
textInfo->staticText.setText(text);
qreal requiredWidth = 0;
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 QHash<QByteArray, QVariant> values = data();
- const KItemListStyleOption& option = styleOption();
+ const KItemListStyleOption &option = styleOption();
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 = QApplication::isRightToLeft() ? option.padding : 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)) {
- const QString text = roleText(role, values);
- TextInfo* textInfo = m_textInfo.value(role);
+ const qreal maxWidth = size().width() - iconSize() - 4 * option.padding;
+ for (const QByteArray &role : std::as_const(m_sortedVisibleRoles)) {
+ const QString text = escapeString(roleText(role, values));
+ TextInfo *textInfo = m_textInfo.value(role);
textInfo->staticText.setText(text);
qreal requiredWidth = m_customizedFontMetrics.horizontalAdvance(text);
// +------+
m_textRect = QRectF();
- const KItemListStyleOption& option = styleOption();
+ const KItemListStyleOption &option = styleOption();
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 firstColumnInc = iconSize();
if (m_supportsItemExpanding) {
firstColumnInc += (m_expansionArea.left() + m_expansionArea.right() + widgetHeight) / 2;
} else {
- firstColumnInc += option.padding + leadingPadding();
+ firstColumnInc += option.padding + sidePadding();
}
qreal x = firstColumnInc;
const qreal y = qMax(qreal(option.padding), (widgetHeight - fontHeight) / 2);
- for (const QByteArray& role : qAsConst(m_sortedVisibleRoles)) {
+ for (const QByteArray &role : std::as_const(m_sortedVisibleRoles)) {
QString text = roleText(role, values);
// Elide the text in case it does not fit into the available column-width
const bool isTextRole = (role == "text");
if (isTextRole) {
- availableTextWidth -= firstColumnInc - leadingPadding();
+ text = escapeString(text);
+ availableTextWidth -= firstColumnInc - sidePadding();
}
if (requiredWidth > availableTextWidth) {
requiredWidth = m_customizedFontMetrics.horizontalAdvance(text);
}
- TextInfo* textInfo = m_textInfo.value(role);
+ TextInfo *textInfo = m_textInfo.value(role);
textInfo->staticText.setText(text);
textInfo->pos = QPointF(x + columnWidthInc / 2, y);
x += roleWidth;
if (isTextRole) {
- const qreal textWidth = option.extendedSelectionRegion
- ? size().width() - textInfo->pos.x()
- : requiredWidth + 2 * option.padding;
- m_textRect = QRectF(textInfo->pos.x() - option.padding, 0,
- textWidth, size().height());
+ const qreal textWidth = option.extendedSelectionRegion ? size().width() - textInfo->pos.x() : requiredWidth + 2 * option.padding;
+ m_textRect = QRectF(textInfo->pos.x() - option.padding, 0, textWidth, size().height());
// 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 -= firstColumnInc - sidePadding();
} else if (isRoleRightAligned(role)) {
textInfo->pos.rx() += roleWidth - requiredWidth - columnWidthInc;
}
void KStandardItemListWidget::updateAdditionalInfoTextColor()
{
QColor c1;
+ const bool hasFocus = scene()->views()[0]->parentWidget()->hasFocus();
if (m_customTextColor.isValid()) {
c1 = m_customTextColor;
- } else if (isSelected()) {
+ } else if (isSelected() && hasFocus && (m_layout != DetailsLayout || m_highlightEntireRow)) {
// The detail text colour needs to match the main text (HighlightedText) for the same level
// of readability. We short circuit early here to avoid interpolating with another colour.
m_additionalInfoTextColor = styleOption().palette.color(QPalette::HighlightedText);
const QColor c2 = styleOption().palette.base().color();
const int p1 = 70;
const int p2 = 100 - p1;
- m_additionalInfoTextColor = QColor((c1.red() * p1 + c2.red() * p2) / 100,
- (c1.green() * p1 + c2.green() * p2) / 100,
- (c1.blue() * p1 + c2.blue() * p2) / 100);
+ m_additionalInfoTextColor =
+ QColor((c1.red() * p1 + c2.red() * p2) / 100, (c1.green() * p1 + c2.green() * p2) / 100, (c1.blue() * p1 + c2.blue() * p2) / 100);
}
-void KStandardItemListWidget::drawPixmap(QPainter* painter, const QPixmap& pixmap)
+void KStandardItemListWidget::drawPixmap(QPainter *painter, const QPixmap &pixmap)
{
if (m_scaledPixmapSize != pixmap.size() / pixmap.devicePixelRatio()) {
+ const qreal dpr = KItemViewsUtils::devicePixelRatio(this);
QPixmap scaledPixmap = pixmap;
- KPixmapModifier::scale(scaledPixmap, m_scaledPixmapSize * qApp->devicePixelRatio());
- scaledPixmap.setDevicePixelRatio(qApp->devicePixelRatio());
+ KPixmapModifier::scale(scaledPixmap, m_scaledPixmapSize * dpr);
+ scaledPixmap.setDevicePixelRatio(dpr);
painter->drawPixmap(m_pixmapPos, scaledPixmap);
#ifdef KSTANDARDITEMLISTWIDGET_DEBUG
}
}
-void KStandardItemListWidget::drawSiblingsInformation(QPainter* painter)
+void KStandardItemListWidget::drawSiblingsInformation(QPainter *painter)
{
const int siblingSize = size().height();
const int x = (m_expansionArea.left() + m_expansionArea.right() - siblingSize) / 2;
}
}
-QRectF KStandardItemListWidget::roleEditingRect(const QByteArray& role) const
+QRectF KStandardItemListWidget::roleEditingRect(const QByteArray &role) const
{
- const TextInfo* textInfo = m_textInfo.value(role);
+ const TextInfo *textInfo = m_textInfo.value(role);
if (!textInfo) {
return QRectF();
}
void KStandardItemListWidget::closeRoleEditor()
{
- disconnect(m_roleEditor, &KItemListRoleEditor::roleEditingCanceled,
- this, &KStandardItemListWidget::slotRoleEditingCanceled);
- disconnect(m_roleEditor, &KItemListRoleEditor::roleEditingFinished,
- this, &KStandardItemListWidget::slotRoleEditingFinished);
+ disconnect(m_roleEditor, &KItemListRoleEditor::roleEditingCanceled, this, &KStandardItemListWidget::slotRoleEditingCanceled);
+ disconnect(m_roleEditor, &KItemListRoleEditor::roleEditingFinished, this, &KStandardItemListWidget::slotRoleEditingFinished);
if (m_roleEditor->hasFocus()) {
// If the editing was not ended by a FocusOut event, we have
m_roleEditor = nullptr;
}
-QPixmap KStandardItemListWidget::pixmapForIcon(const QString& name, const QStringList& overlays, int size, QIcon::Mode mode)
+QPixmap KStandardItemListWidget::pixmapForIcon(const QString &name, const QStringList &overlays, int size, QIcon::Mode mode) const
{
static const QIcon fallbackIcon = QIcon::fromTheme(QStringLiteral("unknown"));
+ const qreal dpr = KItemViewsUtils::devicePixelRatio(this);
- size *= qApp->devicePixelRatio();
+ size *= dpr;
- const QString key = "KStandardItemListWidget:" % name % ":" % overlays.join(QLatin1Char(':')) % ":" % QString::number(size) % ":" % QString::number(mode);
+ const QString key = "KStandardItemListWidget:" % name % ":" % overlays.join(QLatin1Char(':')) % ":" % QString::number(size) % "@" % QString::number(dpr)
+ % ":" % QString::number(mode);
QPixmap pixmap;
if (!QPixmapCache::find(key, &pixmap)) {
if (icon.isNull()) {
icon = QIcon(name);
}
- if (icon.isNull()
- || icon.pixmap(size / qApp->devicePixelRatio(), size / qApp->devicePixelRatio(), mode).isNull()) {
+ if (icon.isNull() || icon.pixmap(size / dpr, size / dpr, mode).isNull()) {
icon = fallbackIcon;
}
- pixmap = icon.pixmap(size / qApp->devicePixelRatio(), size / qApp->devicePixelRatio(), mode);
+ pixmap = icon.pixmap(QSize(size / dpr, size / dpr), dpr, mode);
if (pixmap.width() != size || pixmap.height() != size) {
KPixmapModifier::scale(pixmap, QSize(size, size));
}
// It is more efficient to do it here, as KIconLoader::drawOverlays()
// assumes that an overlay will be drawn and has some additional
// setup time.
- for (const QString& overlay : overlays) {
+ for (const QString &overlay : overlays) {
if (!overlay.isEmpty()) {
int state = KIconLoader::DefaultState;
QPixmapCache::insert(key, pixmap);
}
- pixmap.setDevicePixelRatio(qApp->devicePixelRatio());
+ pixmap.setDevicePixelRatio(dpr);
return pixmap;
}
-QSizeF KStandardItemListWidget::preferredRatingSize(const KItemListStyleOption& option)
+QSizeF KStandardItemListWidget::preferredRatingSize(const KItemListStyleOption &option)
{
const qreal height = option.fontMetrics.ascent();
return QSizeF(height * 5, height);
}
-qreal KStandardItemListWidget::columnPadding(const KItemListStyleOption& option)
+qreal KStandardItemListWidget::columnPadding(const KItemListStyleOption &option)
{
return option.padding * 6;
}
+#include "moc_kstandarditemlistwidget.cpp"
projects / dolphin.git / blobdiff