From 7949aee2d2528fb3adfc83d43799f1566e835466 Mon Sep 17 00:00:00 2001 From: Ismael Asensio Date: Thu, 7 Nov 2019 01:34:19 +0100 Subject: [PATCH] Make the search box more compact Summary: Reduce the spacing between widgets and remove the content margins on the extended search options to have a more compact and space-saving layout. Currently, some widgets are not even aligned. This will be even more important if we remove the toggle button for 'More Options'. CCBUG: 386754 Test Plan: BEFORE: {F7681182} AFTER: {F7681184} Reviewers: elvisangelaccio, ngraham, #dolphin, #vdg Reviewed By: elvisangelaccio, ngraham, #dolphin, #vdg Subscribers: kfm-devel Tags: #dolphin Differential Revision: https://phabricator.kde.org/D25028 --- src/global.h | 1 + src/search/dolphinfacetswidget.cpp | 1 + src/search/dolphinsearchbox.cpp | 4 ++++ 3 files changed, 6 insertions(+) diff --git a/src/global.h b/src/global.h index fb58036afc..d1a3f4f52c 100644 --- a/src/global.h +++ b/src/global.h @@ -52,6 +52,7 @@ namespace Dolphin { * TODO: Move this somewhere global to all KDE apps, not just Dolphin */ const int VERTICAL_SPACER_HEIGHT = 18; + const int LAYOUT_SPACING_SMALL = 2; } #endif //GLOBAL_H diff --git a/src/search/dolphinfacetswidget.cpp b/src/search/dolphinfacetswidget.cpp index 1b87e7c3d3..1827192259 100644 --- a/src/search/dolphinfacetswidget.cpp +++ b/src/search/dolphinfacetswidget.cpp @@ -64,6 +64,7 @@ DolphinFacetsWidget::DolphinFacetsWidget(QWidget* parent) : initComboBox(m_ratingSelector); QHBoxLayout* topLayout = new QHBoxLayout(this); + topLayout->setContentsMargins(0, 0, 0, 0); topLayout->addWidget(m_typeSelector); topLayout->addWidget(m_dateSelector); topLayout->addWidget(m_ratingSelector); diff --git a/src/search/dolphinsearchbox.cpp b/src/search/dolphinsearchbox.cpp index f31d739b42..20f767cbca 100644 --- a/src/search/dolphinsearchbox.cpp +++ b/src/search/dolphinsearchbox.cpp @@ -17,6 +17,7 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA * * **************************************************************************/ +#include "global.h" #include "dolphinsearchbox.h" #include "dolphin_searchsettings.h" @@ -417,11 +418,13 @@ void DolphinSearchBox::init() m_facetsWidget = new DolphinFacetsWidget(this); m_facetsWidget->installEventFilter(this); m_facetsWidget->setSizePolicy(QSizePolicy::Preferred, QSizePolicy::Maximum); + m_facetsWidget->layout()->setSpacing(Dolphin::LAYOUT_SPACING_SMALL); connect(m_facetsWidget, &DolphinFacetsWidget::facetChanged, this, &DolphinSearchBox::slotFacetChanged); // Apply layout for the options QHBoxLayout* optionsLayout = new QHBoxLayout(); optionsLayout->setContentsMargins(0, 0, 0, 0); + optionsLayout->setSpacing(Dolphin::LAYOUT_SPACING_SMALL); optionsLayout->addWidget(m_fileNameButton); optionsLayout->addWidget(m_contentButton); optionsLayout->addWidget(m_separator); @@ -447,6 +450,7 @@ void DolphinSearchBox::init() m_topLayout = new QVBoxLayout(this); m_topLayout->setContentsMargins(0, 0, 0, 0); + m_topLayout->setSpacing(Dolphin::LAYOUT_SPACING_SMALL); m_topLayout->addLayout(searchInputLayout); m_topLayout->addWidget(m_optionsScrollArea); m_topLayout->addWidget(m_facetsWidget);