From a0318e5a17ea34f24118006bb4eeed45e2b20da2 Mon Sep 17 00:00:00 2001 From: liujinchang Date: Mon, 8 Jan 2024 15:27:39 +0800 Subject: [PATCH] fix: [ui] fix search filter background fix search filter background and fix tag crumbedit for refresh will lose text when editing Log: [ui] fix search filter background Bug: https://pms.uniontech.com/bug-view-237399.html https://pms.uniontech.com/bug-view-237399.html --- .../common/dfmplugin-tag/widgets/tagwidget.cpp | 4 ++-- .../treeviews/sidebarwidget.cpp | 7 +++++++ .../topwidget/advancesearchbar.cpp | 17 +++++++++++++---- 3 files changed, 22 insertions(+), 6 deletions(-) diff --git a/src/plugins/common/dfmplugin-tag/widgets/tagwidget.cpp b/src/plugins/common/dfmplugin-tag/widgets/tagwidget.cpp index 4aab3e2980..cb11d26a67 100644 --- a/src/plugins/common/dfmplugin-tag/widgets/tagwidget.cpp +++ b/src/plugins/common/dfmplugin-tag/widgets/tagwidget.cpp @@ -78,9 +78,9 @@ bool TagWidget::shouldShow(const QUrl &url) void TagWidget::onCrumbListChanged() { - if (!d->crumbEdit->property("updateCrumbsColor").toBool()) { + if (!d->crumbEdit->isEditing() && !d->crumbEdit->property("updateCrumbsColor").toBool()) { updateCrumbsColor(TagManager::instance()->assignColorToTags((d->crumbEdit->crumbList()))); - if (!d->crumbEdit->isEditing() && !d->crumbEdit->property("LoadFileTags").toBool()) { + if (!d->crumbEdit->property("LoadFileTags").toBool()) { bool ret = TagManager::instance()->setTagsForFiles(d->crumbEdit->crumbList(), { d->url }); if (!ret) { diff --git a/src/plugins/filemanager/core/dfmplugin-sidebar/treeviews/sidebarwidget.cpp b/src/plugins/filemanager/core/dfmplugin-sidebar/treeviews/sidebarwidget.cpp index 8a4b7c75d3..a4c6b614ad 100644 --- a/src/plugins/filemanager/core/dfmplugin-sidebar/treeviews/sidebarwidget.cpp +++ b/src/plugins/filemanager/core/dfmplugin-sidebar/treeviews/sidebarwidget.cpp @@ -28,6 +28,7 @@ #include #include #include +#include using namespace dfmplugin_sidebar; DFMBASE_USE_NAMESPACE @@ -289,6 +290,12 @@ void SideBarWidget::onItemRenamed(const QModelIndex &index, const QString &newNa void SideBarWidget::initializeUi() { + QGraphicsDropShadowEffect *effect = new QGraphicsDropShadowEffect; + effect->setColor(QColor(0, 0, 0, 5)); + effect->setOffset(4, 0); + effect->setBlurRadius(20); + setGraphicsEffect(effect); + QVBoxLayout *vlayout = new QVBoxLayout(this); QWidget *spacer = new QWidget(this); diff --git a/src/plugins/filemanager/dfmplugin-search/topwidget/advancesearchbar.cpp b/src/plugins/filemanager/dfmplugin-search/topwidget/advancesearchbar.cpp index 16b22cb96f..88dbbb1822 100644 --- a/src/plugins/filemanager/dfmplugin-search/topwidget/advancesearchbar.cpp +++ b/src/plugins/filemanager/dfmplugin-search/topwidget/advancesearchbar.cpp @@ -25,6 +25,7 @@ #include #ifdef DTKWIDGET_CLASS_DSizeMode # include +#include #endif DFMBASE_USE_NAMESPACE @@ -141,8 +142,12 @@ void AdvanceSearchBarPrivate::initUI() formLayout->setSpacing(6); formLayout->setMargin(6); + QVBoxLayout *vLayout = new QVBoxLayout(this); + vLayout->addSpacing(10); + vLayout->addLayout(formLayout); + mainLayout->addSpacing(20); - mainLayout->addLayout(formLayout); + mainLayout->addLayout(vLayout); mainLayout->addSpacing(20); q->setWidget(this); @@ -445,8 +450,13 @@ AdvanceSearchBar::AdvanceSearchBar(QWidget *parent) : QScrollArea(parent), d(new AdvanceSearchBarPrivate(this)) { + QGraphicsDropShadowEffect *effect = new QGraphicsDropShadowEffect; + effect->setColor(QColor(0, 0, 0, 5)); + effect->setOffset(0, 4); + effect->setBlurRadius(20); + setGraphicsEffect(effect); #ifdef DTKWIDGET_CLASS_DSizeMode - setFixedHeight(DSizeModeHelper::element(73, QWIDGETSIZE_MAX)); + setFixedHeight(DSizeModeHelper::element(83, 110)); connect(DGuiApplicationHelper::instance(), &DGuiApplicationHelper::sizeModeChanged, this, &AdvanceSearchBar::initUiForSizeMode); #endif } @@ -454,8 +464,7 @@ AdvanceSearchBar::AdvanceSearchBar(QWidget *parent) void AdvanceSearchBar::initUiForSizeMode() { #ifdef DTKWIDGET_CLASS_DSizeMode - this->setFixedHeight(QWIDGETSIZE_MAX); - disconnect(DGuiApplicationHelper::instance(), &DGuiApplicationHelper::sizeModeChanged, this, &AdvanceSearchBar::initUiForSizeMode); + setFixedHeight(DSizeModeHelper::element(83, 110)); #endif }