X-Git-Url: https://cloud.milkyroute.net/gitweb/dolphin.git/blobdiff_plain/8e55f2c2409fd6ca9ebc66a6568f4d3bcbef7576..57cdee59512e0c0fe11d3e98c2258431bcd87f51:/src/selectionmode/topbar.cpp

diff --git a/src/selectionmode/topbar.cpp b/src/selectionmode/topbar.cpp
index d783c76ca..0b4cbbda6 100644
--- a/src/selectionmode/topbar.cpp
+++ b/src/selectionmode/topbar.cpp
@@ -15,12 +15,10 @@
 
 #include <QHBoxLayout>
 #include <QLabel>
-#include <QPalette>
 #include <QPropertyAnimation>
 #include <QPushButton>
 #include <QScrollArea>
 #include <QStyle>
-#include <QtGlobal>
 
 using namespace SelectionMode;
 
@@ -42,7 +40,7 @@ TopBar::TopBar(QWidget *parent) :
     fillParentLayout->setContentsMargins(0, 0, 0, 0);
 
     // Put the contents into a QScrollArea. This prevents increasing the view width
-    // in case that not enough width for the contents is available. (this trick is also used in selectionmodebottombar.cpp.)
+    // in case that not enough width for the contents is available. (this trick is also used in bottombar.cpp.)
     auto scrollArea = new QScrollArea(this);
     fillParentLayout->addWidget(scrollArea);
     scrollArea->setFrameShape(QFrame::NoFrame);
@@ -66,11 +64,10 @@ TopBar::TopBar(QWidget *parent) :
     BackgroundColorHelper::instance()->controlBackgroundColor(m_label);
 
     m_closeButton = new QPushButton(QIcon::fromTheme(QStringLiteral("window-close-symbolic")), "", contentsContainer);
-    m_closeButton->setToolTip(i18nc("@action:button", "Exit Selection Mode"));
-    m_closeButton->setAccessibleName(m_closeButton->toolTip());
+    m_closeButton->setText(i18nc("@action:button", "Exit Selection Mode"));
     m_closeButton->setFlat(true);
-    connect(m_closeButton, &QAbstractButton::pressed,
-            this, &TopBar::leaveSelectionModeRequested);
+    connect(m_closeButton, &QAbstractButton::clicked,
+            this, &TopBar::selectionModeLeavingRequested);
 
     QHBoxLayout *layout = new QHBoxLayout(contentsContainer);
     auto contentsMargins = layout->contentsMargins();
@@ -111,9 +108,10 @@ void TopBar::setVisible(bool visible, Animated animated)
     m_heightAnimation->start(QAbstractAnimation::DeleteWhenStopped);
 }
 
-void TopBar::resizeEvent(QResizeEvent */* resizeEvent */)
+void TopBar::resizeEvent(QResizeEvent *resizeEvent)
 {
     updateLabelString();
+    return QWidget::resizeEvent(resizeEvent);
 }
 
 void TopBar::updateLabelString()