fix: [workspace]display issue

reset the item name label rect. Log: fix dissplay issue Bug: https://pms.uniontech.com/bug-view-239625.html
linuxdeepin · Jan 19, 2024 · f865d4e · f865d4e
1 parent 399d5f9
commit f865d4e
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 7 deletions.
diff --git a/src/plugins/filemanager/core/dfmplugin-workspace/views/expandedItem.cpp b/src/plugins/filemanager/core/dfmplugin-workspace/views/expandedItem.cpp
@@ -57,10 +57,10 @@ void ExpandedItem::paintEvent(QPaintEvent *)
 
     const QMargins &margins = contentsMargins();
 
-    QRectF labelRect(kIconModeTextPadding + margins.left(),
-                     margins.top() + iconHeight + kIconModeTextPadding + 2 * kIconModeIconSpacing,
-                     width() - kIconModeTextPadding * 2 - margins.left() - margins.right(),
-                     INT_MAX);
+    QRect labelRect(kIconModeRectRadius + margins.left(),
+                    iconHeight + kIconModeTextPadding + 2 * kIconModeIconSpacing + margins.top(),
+                    width() - kIconModeRectRadius * 2,
+                    INT_MAX);
 
     QString str = delegate->displayFileName(index);
 
@@ -174,7 +174,7 @@ QRectF ExpandedItem::textGeometry(int width) const
 
         QRect labelRect(kIconModeTextPadding + margins.left(),
                         iconHeight + kIconModeTextPadding + 2 * kIconModeIconSpacing + margins.top(),
-                        width - kIconModeTextPadding * 2,
+                        width - kIconModeRectRadius * 2,
                         INT_MAX);
 
         QString str = delegate->displayFileName(index);

diff --git a/src/plugins/filemanager/core/dfmplugin-workspace/views/iconitemdelegate.cpp b/src/plugins/filemanager/core/dfmplugin-workspace/views/iconitemdelegate.cpp
@@ -559,12 +559,13 @@ void IconItemDelegate::paintItemFileName(QPainter *painter, QRectF iconRect, QPa
             : QBrush(Qt::NoBrush);
     QScopedPointer<ElideTextLayout> layout(ItemDelegateHelper::createTextLayout(displayName, QTextOption::WrapAtWordBoundaryOrAnywhere,
                                                                                 d->textLineHeight, Qt::AlignCenter, painter));
+
+    labelRect.setLeft(labelRect.left() + kIconModeRectRadius);
     labelRect.setWidth(labelRect.width() - kIconModeRectRadius);
     const FileInfoPointer &info = parent()->fileInfo(index);
     WorkspaceEventSequence::instance()->doIconItemLayoutText(info, layout.data());
     if (!singleSelected && isSelectedOpt) {
         layout->setAttribute(ElideTextLayout::kBackgroundRadius, kIconModeRectRadius);
-        labelRect.setLeft(labelRect.left() + kIconModeRectRadius);
     }
 
     layout->layout(labelRect, opt.textElideMode, painter, background);
@@ -653,7 +654,7 @@ void IconItemDelegate::updateEditorGeometry(QWidget *editor, const QStyleOptionV
         //重置textBounding，使其在adjustSize重新计算，否则在调整图标大小时使用旧的textBounding计算导致显示不全
         d->expandedItem->show();
         d->expandedItem->setTextBounding(QRect());
-        editor->setFixedWidth(option.rect.width() - kIconModeRectRadius);
+        editor->setFixedWidth(option.rect.width());
         d->expandedItem->setIconHeight(iconSize.height());
         editor->adjustSize();