listview: set static width, fix height, padding #34

Author: rodlie

fm/src/mainwindow.cpp

@@ -1636,29 +1636,25 @@ void MainWindow::updateGrid()
 {
     if (!iconAct->isChecked()) { return; }
     QFontMetrics fm = fontMetrics();
-    int textWidth = fm.averageCharWidth() * 13;
+    int textWidth = fm.averageCharWidth() * 15;
+    int realTextWidth = fm.averageCharWidth() * 13;
     int textHeight = fm.lineSpacing() * 3;
     QSize grid;
-    grid.setWidth(qMax(zoom, textWidth) + 4);
-    grid.setHeight(zoom+ textHeight + 4);
+    grid.setWidth(qMax(zoom, textWidth));
+    grid.setHeight(zoom+textHeight);
 
     QModelIndexList items;
     for (int x = 0; x < modelList->rowCount(modelList->index(pathEdit->currentText())); ++x) {
         items.append(modelList->index(x,0,modelList->index(pathEdit->currentText())));
     }
     foreach (QModelIndex theItem,items) {
         QString filename = modelList->fileName(theItem);
-        QRect txtRect(0, 0, grid.width(), grid.height());
-        QSize txtsize = fm.boundingRect(txtRect, Qt::AlignCenter|Qt::TextWrapAnywhere, filename).size();
-        int width = txtsize.width()+8;
-        if (width<zoom) { width = zoom+8; }
-        if (width>grid.width()) { grid.setWidth(width); }
-        if (txtsize.height()+zoom+8>grid.height()) { grid.setHeight(txtsize.height()+zoom+8); }
-        //qDebug() << filename << txtsize;
+        QRect item(0,0,realTextWidth,grid.height());
+        QSize txtsize = fm.boundingRect(item, Qt::AlignCenter|Qt::TextWrapAnywhere, filename).size();
+        int newHeight = txtsize.height()+zoom+5;
+        if (newHeight>grid.height()) { grid.setHeight(newHeight); }
     }
-
     if (list->gridSize() != grid) {
-        qDebug() << "SET GRID" << grid;
         list->setGridSize(grid);
     }
 }

fm/src/mainwindow.h

@@ -102,15 +102,13 @@ class IconViewDelegate : public QStyledItemDelegate
     {
         QIcon icon = qvariant_cast<QIcon>(index.data(Qt::DecorationRole));
         QSize iconsize = icon.actualSize(option.decorationSize);
-        QRect item = option.rect;
-        QRect txtRect(item.left(), item.top()+iconsize.height(),
-                      item.width(), item.height()-iconsize.height());
+        int width = qMax(iconsize.width(), option.fontMetrics.averageCharWidth() * 13);
+        QRect txtRect(0, 0, width, option.rect.height());
         QSize txtsize = option.fontMetrics.boundingRect(txtRect,
                                                         Qt::AlignCenter|Qt::TextWrapAnywhere,
                                                         index.data().toString()).size();
-        int width = txtsize.width();
-        if (width<iconsize.width()) { width = iconsize.width(); }
-        return QSize(width+10,txtsize.height()+iconsize.height());
+        QSize size(width, txtsize.height()+iconsize.height());
+        return size;
     }
     void paint(QPainter *painter, const QStyleOptionViewItem &option, const QModelIndex &index) const
     {
@@ -119,8 +117,8 @@ class IconViewDelegate : public QStyledItemDelegate
         QRect item = option.rect;
         QRect iconRect(item.left()+(item.width()/2)-(iconsize.width()/2),
                        item.top(), iconsize.width(), iconsize.height());
-        QRect txtRect(item.left()+5, item.top()+iconsize.height(),
-                      item.width()-10, item.height()-iconsize.height());
+        QRect txtRect(item.left(), item.top()+iconsize.height(),
+                      item.width(), item.height()-iconsize.height());
         QBrush txtBrush = qvariant_cast<QBrush>(index.data(Qt::ForegroundRole));
         bool isSelected = option.state & QStyle::State_Selected;
         bool isEditing = _isEditing && index==_index;