From 1ee665bac8bd7f79d242213ebfd7d2095d392523 Mon Sep 17 00:00:00 2001
From: Nate Graham <nate@kde.org>
Date: Tue, 12 May 2020 14:17:51 -0600
Subject: [PATCH] Move search and filter bar close buttons to the right

Summary:
Close buttons for windows, tabs, and pretty much everything else in KDE are on the right,
not the left. This patch makes Dolphin's search and filter bars follow that.

BUG: 421372
FIXED-IN: 20.08.0

Test Plan: {F8314176}

Reviewers: abetts, #dolphin, #vdg, elvisangelaccio, GB_2

Reviewed By: #dolphin, #vdg, elvisangelaccio, GB_2

Subscribers: kfm-devel

Tags: #dolphin

Differential Revision: https://phabricator.kde.org/D29693
---
 src/filterbar/filterbar.cpp     | 16 ++++++++--------
 src/search/dolphinsearchbox.cpp | 16 ++++++++--------
 2 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/src/filterbar/filterbar.cpp b/src/filterbar/filterbar.cpp
index 50af2c6c7..93e929c45 100644
--- a/src/filterbar/filterbar.cpp
+++ b/src/filterbar/filterbar.cpp
@@ -32,13 +32,6 @@
 FilterBar::FilterBar(QWidget* parent) :
     QWidget(parent)
 {
-    // Create close button
-    QToolButton *closeButton = new QToolButton(this);
-    closeButton->setAutoRaise(true);
-    closeButton->setIcon(QIcon::fromTheme(QStringLiteral("dialog-close")));
-    closeButton->setToolTip(i18nc("@info:tooltip", "Hide Filter Bar"));
-    connect(closeButton, &QToolButton::clicked, this, &FilterBar::closeRequest);
-
     // Create button to lock text when changing folders
     m_lockButton = new QToolButton(this);
     m_lockButton->setAutoRaise(true);
@@ -57,12 +50,19 @@ FilterBar::FilterBar(QWidget* parent) :
             this, &FilterBar::filterChanged);
     setFocusProxy(m_filterInput);
 
+    // Create close button
+    QToolButton *closeButton = new QToolButton(this);
+    closeButton->setAutoRaise(true);
+    closeButton->setIcon(QIcon::fromTheme(QStringLiteral("dialog-close")));
+    closeButton->setToolTip(i18nc("@info:tooltip", "Hide Filter Bar"));
+    connect(closeButton, &QToolButton::clicked, this, &FilterBar::closeRequest);
+
     // Apply layout
     QHBoxLayout* hLayout = new QHBoxLayout(this);
     hLayout->setContentsMargins(0, 0, 0, 0);
-    hLayout->addWidget(closeButton);
     hLayout->addWidget(m_lockButton);
     hLayout->addWidget(m_filterInput);
+    hLayout->addWidget(closeButton);
 }
 
 FilterBar::~FilterBar()
diff --git a/src/search/dolphinsearchbox.cpp b/src/search/dolphinsearchbox.cpp
index cdc0718df..f0d8c5416 100644
--- a/src/search/dolphinsearchbox.cpp
+++ b/src/search/dolphinsearchbox.cpp
@@ -344,13 +344,6 @@ void DolphinSearchBox::saveSettings()
 
 void DolphinSearchBox::init()
 {
-    // Create close button
-    QToolButton* closeButton = new QToolButton(this);
-    closeButton->setAutoRaise(true);
-    closeButton->setIcon(QIcon::fromTheme(QStringLiteral("dialog-close")));
-    closeButton->setToolTip(i18nc("@info:tooltip", "Quit searching"));
-    connect(closeButton, &QToolButton::clicked, this, &DolphinSearchBox::emitCloseRequest);
-
     // Create search box
     m_searchInput = new QLineEdit(this);
     m_searchInput->setPlaceholderText(i18n("Search..."));
@@ -371,11 +364,18 @@ void DolphinSearchBox::init()
     m_searchInput->addAction(m_saveSearchAction, QLineEdit::TrailingPosition);
     connect(m_saveSearchAction, &QAction::triggered, this, &DolphinSearchBox::slotSearchSaved);
 
+    // Create close button
+    QToolButton* closeButton = new QToolButton(this);
+    closeButton->setAutoRaise(true);
+    closeButton->setIcon(QIcon::fromTheme(QStringLiteral("dialog-close")));
+    closeButton->setToolTip(i18nc("@info:tooltip", "Quit searching"));
+    connect(closeButton, &QToolButton::clicked, this, &DolphinSearchBox::emitCloseRequest);
+
     // Apply layout for the search input
     QHBoxLayout* searchInputLayout = new QHBoxLayout();
     searchInputLayout->setContentsMargins(0, 0, 0, 0);
-    searchInputLayout->addWidget(closeButton);
     searchInputLayout->addWidget(m_searchInput);
+    searchInputLayout->addWidget(closeButton);
 
     // Create "Filename" and "Content" button
     m_fileNameButton = new QToolButton(this);
-- 
2.47.3