Revert the 2.0 decision to always use KB for file-sizes

[dolphin.git] / src / kitemviews / kitemlistwidget.cpp

diff --git a/src/kitemviews/kitemlistwidget.cpp b/src/kitemviews/kitemlistwidget.cpp
index 951fb396c54faa540771d32bc1fc10fd981f16f6..b703fbfe233f5ad184df35ddb7d520f20c130ac9 100644 (file)
--- a/src/kitemviews/kitemlistwidget.cpp
+++ b/src/kitemviews/kitemlistwidget.cpp
@@ -44,7 +44,7 @@ KItemListWidget::KItemListWidget(QGraphicsItem* parent) :
     m_enabledSelectionToggle(false),
     m_data(),
     m_visibleRoles(),
-    m_visibleRolesSizes(),
+    m_columnWidths(),
     m_styleOption(),
     m_siblingsInfo(),
     m_hoverOpacity(0),
@@ -122,17 +122,7 @@ void KItemListWidget::paint(QPainter* painter, const QStyleOptionGraphicsItem* o
     if (isCurrent()) {
         QStyleOptionFocusRect focusRectOption;
         focusRectOption.initFrom(widget);
-
-        const QRect iconBounds = iconRect().toRect();
-        const QRect textBounds = textRect().toRect();
-        if (iconBounds.bottom() > textBounds.top()) {
-            focusRectOption.rect = textBounds;
-        } else {
-            // See KItemListWidget::drawItemStyleOption(): The selection rectangle
-            // gets decreased.
-            focusRectOption.rect = textBounds.adjusted(1, 1, -1, -1);
-        }
-
+        focusRectOption.rect = textFocusRect().toRect();
         focusRectOption.state = QStyle::State_Enabled | QStyle::State_Item | QStyle::State_KeyboardFocusChange;
         if (m_selected) {
             focusRectOption.state |= QStyle::State_Selected;
@@ -177,18 +167,20 @@ QList<QByteArray> KItemListWidget::visibleRoles() const
     return m_visibleRoles;
 }
 
-void KItemListWidget::setVisibleRolesSizes(const QHash<QByteArray, QSizeF> rolesSizes)
-{
-    const QHash<QByteArray, QSizeF> previousRolesSizes = m_visibleRolesSizes;
-    m_visibleRolesSizes = rolesSizes;
 
-    visibleRolesSizesChanged(rolesSizes, previousRolesSizes);
-    update();
+void KItemListWidget::setColumnWidth(const QByteArray& role, qreal width)
+{
+    if (m_columnWidths.value(role) != width) {
+        const qreal previousWidth = width;
+        m_columnWidths.insert(role, width);
+        columnWidthChanged(role, width, previousWidth);
+        update();
+    }
 }
 
-QHash<QByteArray, QSizeF> KItemListWidget::visibleRolesSizes() const
+qreal KItemListWidget::columnWidth(const QByteArray& role) const
 {
-    return m_visibleRolesSizes;
+    return m_columnWidths.value(role);
 }
 
 void KItemListWidget::setStyleOption(const KItemListStyleOption& option)
@@ -328,6 +320,11 @@ bool KItemListWidget::contains(const QPointF& point) const
            selectionToggleRect().contains(point);
 }
 
+QRectF KItemListWidget::textFocusRect() const
+{
+    return textRect();
+}
+
 QRectF KItemListWidget::selectionToggleRect() const
 {
     return QRectF();
@@ -352,9 +349,11 @@ void KItemListWidget::visibleRolesChanged(const QList<QByteArray>& current,
     Q_UNUSED(previous);
 }
 
-void KItemListWidget::visibleRolesSizesChanged(const QHash<QByteArray, QSizeF>& current,
-                                               const QHash<QByteArray, QSizeF>& previous)
+void KItemListWidget::columnWidthChanged(const QByteArray& role,
+                                         qreal current,
+                                         qreal previous)
 {
+    Q_UNUSED(role);
     Q_UNUSED(current);
     Q_UNUSED(previous);
 }
@@ -449,14 +448,12 @@ void KItemListWidget::clearHoverCache()
 
 void KItemListWidget::drawItemStyleOption(QPainter* painter, QWidget* widget, QStyle::State styleState)
 {
-    const QRect textBounds = textRect().toRect();
-
     QStyleOptionViewItemV4 viewItemOption;
     viewItemOption.initFrom(widget);
     viewItemOption.state = styleState;
     viewItemOption.viewItemPosition = QStyleOptionViewItemV4::OnlyOne;
     viewItemOption.showDecorationSelected = true;
-    viewItemOption.rect = textBounds.adjusted(1, 0, -1, 0);
+    viewItemOption.rect = textRect().toRect();
     widget->style()->drawPrimitive(QStyle::PE_PanelItemViewItem, &viewItemOption, painter, widget);
 }