Minor optimizations for the menu toolbar-item

2 files changed, 7 insertions, 9 deletions

diff --git a/src/dolphinmainwindow.cpp b/src/dolphinmainwindow.cpp
index 1f3e99f76..1fb9b63e7 100644
--- a/src/dolphinmainwindow.cpp
+++ b/src/dolphinmainwindow.cpp
@@ -53,6 +53,7 @@
 #include "dolphin_iconsmodesettings.h"
 #include "dolphin_searchsettings.h"
 
+#include <KAcceleratorManager>
 #include <KAction>
 #include <KActionCollection>
 #include <KActionMenu>
@@ -71,7 +72,6 @@
 #include <KInputDialog>
 #include <KLocale>
 #include <KProtocolManager>
-#include <KPushButton>
 #include <KMenu>
 #include <KMenuBar>
 #include <KMessageBox>
@@ -93,8 +93,8 @@
 #include <QDBusMessage>
 #include <QKeyEvent>
 #include <QClipboard>
+#include <QToolButton>
 #include <QSplitter>
-#include <kacceleratormanager.h>
 
 /*
  * Remembers the tab configuration if a tab has been closed.
@@ -1962,12 +1962,10 @@ void DolphinMainWindow::createToolBarMenuButton()
     Q_ASSERT(!m_openToolBarMenuButton);
 
     m_toolBarSpacer = new QWidget(this);
-    m_toolBarSpacer->setSizePolicy(QSizePolicy::MinimumExpanding, QSizePolicy::Preferred);
+    m_toolBarSpacer->setSizePolicy(QSizePolicy::MinimumExpanding, QSizePolicy::MinimumExpanding);
 
-    m_openToolBarMenuButton = new KPushButton(this);
-    m_openToolBarMenuButton->setFlat(true);
+    m_openToolBarMenuButton = new QToolButton(this);
     m_openToolBarMenuButton->setIcon(KIcon("configure"));
-    m_openToolBarMenuButton->setMaximumWidth(m_openToolBarMenuButton->sizeHint().height());
 
     // Instead of using QPushButton::setMenu() the opening of the menu is done manually
     // to prevent the "clutter" of the down-arrow drawn by the style.
diff --git a/src/dolphinmainwindow.h b/src/dolphinmainwindow.h
index 7d964cf5f..a242a6546 100644
--- a/src/dolphinmainwindow.h
+++ b/src/dolphinmainwindow.h
@@ -44,12 +44,12 @@ class DolphinSettingsDialog;
 class DolphinViewContainer;
 class DolphinRemoteEncoding;
 class KAction;
+class KJob;
 class KNewFileMenu;
-class KPushButton;
 class KTabBar;
 class KUrl;
 class QSplitter;
-class KJob;
+class QToolButton;
 
 /**
  * @short Main window for Dolphin.
@@ -568,7 +568,7 @@ private:
 
     // Members for the toolbar menu that is shown when the menubar is hidden:
     QWidget* m_toolBarSpacer;
-    KPushButton* m_openToolBarMenuButton;
+    QToolButton* m_openToolBarMenuButton;
     QWeakPointer<KMenu> m_toolBarMenu;
     QTimer* m_updateToolBarTimer;