#include <QTextLayout>
#include <QTextLine>
-//#define KFILEITEMLISTWIDGET_DEBUG
+// #define KFILEITEMLISTWIDGET_DEBUG
KFileItemListWidget::KFileItemListWidget(QGraphicsItem* parent) :
KItemListWidget(parent),
m_isCut(false),
m_isHidden(false),
- m_isDir(false),
+ m_isExpandable(false),
m_dirtyLayout(true),
m_dirtyContent(true),
m_dirtyContentRoles(),
m_pixmapPos(),
m_pixmap(),
m_scaledPixmapSize(),
- m_hoverPixmapRect(),
+ m_originalPixmapSize(),
+ m_iconRect(),
m_hoverPixmap(),
m_textPos(),
m_text(),
void KFileItemListWidget::paint(QPainter* painter, const QStyleOptionGraphicsItem* option, QWidget* widget)
{
- KItemListWidget::paint(painter, option, widget);
-
const_cast<KFileItemListWidget*>(this)->triggerCacheRefreshing();
+ KItemListWidget::paint(painter, option, widget);
+
// Draw expansion toggle '>' or 'V'
- if (m_isDir && !m_expansionArea.isEmpty()) {
+ if (m_isExpandable) {
QStyleOption arrowOption;
arrowOption.rect = m_expansionArea.toRect();
const QStyle::PrimitiveElement arrow = data()["isExpanded"].toBool()
QRectF KFileItemListWidget::iconRect() const
{
const_cast<KFileItemListWidget*>(this)->triggerCacheRefreshing();
-
- QRectF bounds = m_hoverPixmapRect;
- const qreal margin = styleOption().margin;
- bounds.adjust(-margin, -margin, margin, margin);
- return bounds;
+ return m_iconRect;
}
QRectF KFileItemListWidget::textRect() const
QRectF KFileItemListWidget::expansionToggleRect() const
{
const_cast<KFileItemListWidget*>(this)->triggerCacheRefreshing();
- return m_isDir ? m_expansionArea : QRectF();
+ return m_isExpandable ? m_expansionArea : QRectF();
}
QRectF KFileItemListWidget::selectionToggleRect() const
QColor KFileItemListWidget::textColor() const
{
- if (m_customTextColor.isValid()) {
+ if (m_customTextColor.isValid() && !isSelected()) {
return m_customTextColor;
}
refreshCache();
const QHash<QByteArray, QVariant> values = data();
- m_isDir = values["isDir"].toBool();
+ m_isExpandable = values["isExpandable"].toBool();
m_isHidden = values["name"].toString().startsWith(QLatin1Char('.'));
updateExpansionArea();
Q_ASSERT(values.contains("expansionLevel"));
const KItemListStyleOption& option = styleOption();
const int expansionLevel = values.value("expansionLevel", 0).toInt();
-
- const qreal widgetHeight = size().height();
- const qreal expansionLevelSize = KIconLoader::SizeSmall;
- const qreal x = option.margin + expansionLevel * widgetHeight;
- const qreal y = (widgetHeight - expansionLevelSize) / 2;
- m_expansionArea = QRectF(x, y, expansionLevelSize, expansionLevelSize);
- } else {
- m_expansionArea = QRectF();
+ if (expansionLevel >= 0) {
+ const qreal widgetHeight = size().height();
+ const qreal expansionLevelSize = KIconLoader::SizeSmall;
+ const qreal x = option.margin + expansionLevel * widgetHeight;
+ const qreal y = (widgetHeight - expansionLevelSize) / 2;
+ m_expansionArea = QRectF(x, y, expansionLevelSize, expansionLevelSize);
+ return;
+ }
}
+
+ m_expansionArea = QRectF();
}
void KFileItemListWidget::updatePixmapCache()
if (!updatePixmap && m_dirtyContent) {
updatePixmap = m_dirtyContentRoles.isEmpty()
|| m_dirtyContentRoles.contains("iconPixmap")
- || m_dirtyContentRoles.contains("iconName");
+ || m_dirtyContentRoles.contains("iconName")
+ || m_dirtyContentRoles.contains("iconOverlays");
}
if (updatePixmap) {
iconName = QLatin1String("unknown");
}
m_pixmap = pixmapForIcon(iconName, iconHeight);
- m_hoverPixmapRect.setSize(m_pixmap.size());
+ m_originalPixmapSize = m_pixmap.size();
} else if (m_pixmap.size() != QSize(iconHeight, iconHeight)) {
// A custom pixmap has been applied. Assure that the pixmap
// is scaled to the available size.
if (scale) {
KPixmapModifier::scale(m_pixmap, QSize(iconHeight, iconHeight));
}
- m_hoverPixmapRect.setSize(m_pixmap.size());
+ m_originalPixmapSize = m_pixmap.size();
// To simplify the handling of scaling the original pixmap
// will be embedded into a square pixmap.
m_pixmap = squarePixmap;
} else {
- m_hoverPixmapRect.setSize(m_pixmap.size());
+ m_originalPixmapSize = m_pixmap.size();
+ }
+
+ const QStringList overlays = values["iconOverlays"].toStringList();
+
+ // 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.
+ foreach (const QString& overlay, overlays) {
+ if (!overlay.isEmpty()) {
+ // There is at least one overlay, draw all overlays above m_pixmap
+ // and cancel the check
+ KIconLoader::global()->drawOverlays(overlays, m_pixmap, KIconLoader::Desktop);
+ break;
+ }
}
if (m_isCut) {
m_pixmapPos.setY(option.margin);
// Center the hover rectangle horizontally and align it on bottom
- const qreal x = m_pixmapPos.x() + (m_scaledPixmapSize.width() - m_hoverPixmapRect.width()) / 2.0;
- const qreal y = m_pixmapPos.y() + m_scaledPixmapSize.height() - m_hoverPixmapRect.height();
- m_hoverPixmapRect.moveTopLeft(QPointF(x, y));
-
+ qreal hoverWidth = m_originalPixmapSize.width();
+ qreal hoverHeight = m_originalPixmapSize.height();
+ if (scaledIconHeight != m_pixmap.height()) {
+ const qreal scaleFactor = qreal(scaledIconHeight) / qreal(m_pixmap.height());
+ hoverWidth *= scaleFactor;
+ hoverHeight *= scaleFactor;
+ }
+ const qreal hoverX = m_pixmapPos.x() + (m_scaledPixmapSize.width() - hoverWidth) / 2.0;
+ const qreal hoverY = m_pixmapPos.y() + m_scaledPixmapSize.height() - hoverHeight;
+ m_iconRect = QRectF(hoverX, hoverY, hoverWidth, hoverHeight);
+ const qreal margin = option.margin;
+ m_iconRect.adjust(-margin, -margin, margin, margin);
+
// Prepare the pixmap that is used when the item gets hovered
if (isHovered()) {
m_hoverPixmap = m_pixmap;
m_text[Name].setTextWidth(maxWidth);
m_textPos[Name] = QPointF(option.margin, widgetHeight - textLinesCount * fontHeight - option.margin);
m_textRect = QRectF(option.margin + (maxWidth - requiredWidthForName) / 2,
- m_textPos[Name].y(),
- requiredWidthForName,
- m_text[Name].size().height());
+ m_textPos[Name].y(),
+ requiredWidthForName,
+ textLinesCountForName * fontHeight);
// Calculate the position for each additional information
qreal y = m_textPos[Name].y() + textLinesCountForName * fontHeight;
projects / dolphin.git / blobdiff