#include <KIconEffect>
#include <KIconLoader>
+#include <KIconUtils>
#include <KRatingPainter>
#include <KStringHandler>
#include <QGraphicsView>
#include <QPixmapCache>
#include <QStyleOption>
+#include <QTextBoundaryFinder>
#include <QVariantAnimation>
// #define KSTANDARDITEMLISTWIDGET_DEBUG
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, ForUsageAs forUsageAs) const
{
if (role == "rating") {
- // Always use an empty text, as the rating is shown by the image m_rating.
- return QString();
+ if (forUsageAs == ForUsageAs::DisplayedText) {
+ // Always use an empty text, as the rating is shown by the image m_rating.
+ return QString();
+ } else {
+ const int rating{values.value(role).toInt()};
+ // Check if there are half stars
+ if (rating % 2) {
+ return i18ncp("@accessible rating", "%1 and a half stars", "%1 and a half stars", rating / 2);
+ }
+ return i18ncp("@accessible rating", "%1 star", "%1 stars", rating / 2);
+ }
}
return values.value(role).toString();
}
{
const_cast<KStandardItemListWidget *>(this)->triggerCacheRefreshing();
+ const QRectF widgetIconRect = iconRect();
const int widgetIconSize = iconSize();
int toggleSize = KIconLoader::SizeSmall;
if (widgetIconSize >= KIconLoader::SizeEnormous) {
toggleSize = KIconLoader::SizeSmallMedium;
}
- QPointF pos = iconRect().topLeft();
+ QPointF pos = widgetIconRect.topLeft();
// If the selection toggle has a very small distance to the
// widget borders, the size of the selection toggle will get
pos.setX(0);
}
+ if (QApplication::isRightToLeft()) {
+ pos.setX(widgetIconRect.right() - (pos.x() + toggleSize - widgetIconRect.left()));
+ }
+
return QRectF(pos, QSizeF(toggleSize, toggleSize));
}
m_dirtyLayout = true;
}
+int KStandardItemListWidget::numberOfUnicodeCharactersIn(const QString &text)
+{
+ int count = 0;
+ QTextBoundaryFinder boundaryFinder(QTextBoundaryFinder::Grapheme, text);
+ while (boundaryFinder.toNextBoundary() != -1) {
+ ++count;
+ }
+ return count;
+}
+
int KStandardItemListWidget::selectionLength(const QString &text) const
{
- return text.length();
+ return numberOfUnicodeCharactersIn(text);
}
void KStandardItemListWidget::editedRoleChanged(const QByteArray ¤t, const QByteArray &previous)
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);
-
- if (m_oldRoleEditor) {
- m_oldRoleEditor->deleteLater();
- }
- m_oldRoleEditor = m_roleEditor;
- m_roleEditor->hide();
- m_roleEditor = nullptr;
+ closeRoleEditor();
}
return;
}
}
if (m_isCut) {
- KIconEffect *effect = KIconLoader::global()->iconEffect();
- m_pixmap = effect->apply(m_pixmap, KIconLoader::Desktop, KIconLoader::DisabledState);
+#if KICONTHEMES_VERSION >= QT_VERSION_CHECK(6, 5, 0)
+ KIconEffect::toDisabled(m_pixmap);
+#else
+ QImage img = m_pixmap.toImage();
+ KIconEffect::toGray(img, 1);
+ KIconEffect::semiTransparent(img);
+ m_pixmap = QPixmap::fromImage(img);
+#endif
}
if (m_isHidden) {
} 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);
+ 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
// Prepare the pixmap that is used when the item gets hovered
if (isHovered()) {
m_hoverPixmap = m_pixmap;
- 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);
- } else {
- m_hoverPixmap = m_pixmap;
- }
+#if KICONTHEMES_VERSION >= QT_VERSION_CHECK(6, 5, 0)
+ KIconEffect::toActive(m_hoverPixmap);
+#else
+ QImage img = m_pixmap.toImage();
+ KIconEffect::toGamma(img, 0.7);
+ m_hoverPixmap = QPixmap::fromImage(img);
+#endif
} else if (hoverOpacity() <= 0.0) {
// No hover animation is ongoing. Clear m_hoverPixmap to save memory.
m_hoverPixmap = QPixmap();
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);
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);
-#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 qreal textLinesHeight = qMax(visibleRoles().count(), 1) * lineSpacing;
qreal maximumRequiredTextWidth = 0;
- const qreal x = option.padding * 3 + iconSize();
+ 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;
+ 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);
if (m_customTextColor.isValid()) {
c1 = m_customTextColor;
} 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.
+ // The detail text color needs to match the main text (HighlightedText) for the same level
+ // of readability. We short circuit early here to avoid interpolating with another color.
m_additionalInfoTextColor = styleOption().palette.color(QPalette::HighlightedText);
return;
} else {
// Strangely KFileItem::overlays() returns empty string-values, so
// we need to check first whether an overlay must be drawn at all.
- // 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) {
if (!overlay.isEmpty()) {
- int state = KIconLoader::DefaultState;
-
- switch (mode) {
- case QIcon::Normal:
- break;
- case QIcon::Active:
- state = KIconLoader::ActiveState;
- break;
- case QIcon::Disabled:
- state = KIconLoader::DisabledState;
- break;
- case QIcon::Selected:
- state = KIconLoader::SelectedState;
- break;
- }
-
// There is at least one overlay, draw all overlays above m_pixmap
// and cancel the check
- KIconLoader::global()->drawOverlays(overlays, pixmap, KIconLoader::Desktop, state);
+ const QSize size = pixmap.size();
+ pixmap = KIconUtils::addOverlays(pixmap, overlays).pixmap(size, mode);
break;
}
}
projects / dolphin.git / blobdiff