From 1ee665bac8bd7f79d242213ebfd7d2095d392523 Mon Sep 17 00:00:00 2001 From: Nate Graham Date: Tue, 12 May 2020 14:17:51 -0600 Subject: 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 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) (limited to 'src/filterbar/filterbar.cpp') 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() -- cgit v1.3