From 0d72555131a8058fae527782573a81bfe412ef6a Mon Sep 17 00:00:00 2001 From: liyigang Date: Thu, 28 Mar 2024 15:43:50 +0800 Subject: [PATCH] fix: Display issue with preview view Adjust the display margin and modify the border drawing of tags Log: Display issue with preview view Bug: https://pms.uniontech.com/bug-view-245707.html --- .../common/dfmplugin-tag/widgets/private/tagwidget_p.cpp | 1 + .../core/dfmplugin-detailspace/views/detailspacewidget.cpp | 6 ++---- .../core/dfmplugin-detailspace/views/detailview.cpp | 4 ++-- 3 files changed, 5 insertions(+), 6 deletions(-) diff --git a/src/plugins/common/dfmplugin-tag/widgets/private/tagwidget_p.cpp b/src/plugins/common/dfmplugin-tag/widgets/private/tagwidget_p.cpp index 949b2e2aba..8beb637e38 100644 --- a/src/plugins/common/dfmplugin-tag/widgets/private/tagwidget_p.cpp +++ b/src/plugins/common/dfmplugin-tag/widgets/private/tagwidget_p.cpp @@ -36,6 +36,7 @@ TagWidgetPrivate::~TagWidgetPrivate() void TagWidgetPrivate::initializeUI() { + q->setFrameShape(QFrame::NoFrame); mainLayout = new QVBoxLayout(q); q->setLayout(mainLayout); QString name = tr("Tag"); diff --git a/src/plugins/filemanager/core/dfmplugin-detailspace/views/detailspacewidget.cpp b/src/plugins/filemanager/core/dfmplugin-detailspace/views/detailspacewidget.cpp index 4ecf94015a..5162894fe8 100644 --- a/src/plugins/filemanager/core/dfmplugin-detailspace/views/detailspacewidget.cpp +++ b/src/plugins/filemanager/core/dfmplugin-detailspace/views/detailspacewidget.cpp @@ -85,10 +85,8 @@ void DetailSpaceWidget::initializeUi() QHBoxLayout *rvLayout = new QHBoxLayout(this); rvLayout->setMargin(0); detailView = new DetailView(this); - DFrame *rightDetailVLine = new DFrame(this); - rightDetailVLine->setFrameShape(QFrame::VLine); - rvLayout->addWidget(rightDetailVLine); - rvLayout->addWidget(detailView, 1); + rvLayout->addWidget(detailView); + setLayout(rvLayout); } void DetailSpaceWidget::initConnect() diff --git a/src/plugins/filemanager/core/dfmplugin-detailspace/views/detailview.cpp b/src/plugins/filemanager/core/dfmplugin-detailspace/views/detailview.cpp index b749705f05..e986fbb71d 100644 --- a/src/plugins/filemanager/core/dfmplugin-detailspace/views/detailview.cpp +++ b/src/plugins/filemanager/core/dfmplugin-detailspace/views/detailview.cpp @@ -139,7 +139,7 @@ void DetailView::createHeadUI(const QUrl &url, int widgetFilter) iconLabel = new DLabel(this); iconLabel->setFixedSize(240, 240); - QSize targetSize(240, 160); + QSize targetSize(240, 240); auto findPluginIcon = [](const QUrl &url) -> QString { QString iconName; bool ok = dpfHookSequence->run(kCurrentEventSpace, "hook_Icon_Fetch", url, &iconName); @@ -170,7 +170,7 @@ void DetailView::createHeadUI(const QUrl &url, int widgetFilter) px.setDevicePixelRatio(qApp->devicePixelRatio()); iconLabel->setPixmap(px); iconLabel->setAlignment(Qt::AlignCenter); - iconLabel->setContentsMargins(0, 0, 0, 15); + iconLabel->setContentsMargins(-15, 0, 0, 15); vLayout->insertWidget(0, iconLabel, 0, Qt::AlignHCenter); } }