From f248335bd0bb183afceeb844592e3dca628fb4c5 Mon Sep 17 00:00:00 2001
From: Craig Drummond <craig.p.drummond@gmail.com>
Date: Tue, 1 May 2018 22:23:52 +0100
Subject: [PATCH] Slightly reduce height of toolbar.

---
 ChangeLog          | 1 +
 gui/mainwindow.cpp | 9 +++++++--
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 0f94290ad..b6f9fe219 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -17,6 +17,7 @@
 12. When playing, only poll MPD every 5 seconds.
 13. When updating play seekbar from MPDStatus, only upate if more than 1
     second from calculated position.
+14. Slightly reduce height of toolbar.
 
 2.3.0
 -----
diff --git a/gui/mainwindow.cpp b/gui/mainwindow.cpp
index 5b00debd6..c7dcd0104 100644
--- a/gui/mainwindow.cpp
+++ b/gui/mainwindow.cpp
@@ -208,7 +208,7 @@ void MainWindow::init()
     Song::setUseOriginalYear(Settings::self()->useOriginalYear());
 
     int hSpace=Utils::layoutSpacing(this);
-    int vSpace=fontMetrics().height()<14 ? hSpace/2 : 0;
+    int vSpace=Utils::scaleForDpi(2);
     toolbarLayout->setContentsMargins(hSpace, vSpace, hSpace, vSpace);
     toolbar->setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Fixed);
     setWindowTitle("Cantata");
@@ -236,10 +236,15 @@ void MainWindow::init()
         topToolBar->setContextMenuPolicy(Qt::PreventContextMenu);
         topToolBar->setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Fixed);
         topToolBar->setContentsMargins(0, 0, 0, 0);
+        QLayout *l=topToolBar->layout();
+        if (l) {
+            l->setMargin(0);
+            l->setSpacing(0);
+        }
         topToolBar->ensurePolished();
         toolbar=topToolBar;
     } else {
-        toolbar->setFixedHeight(qMax(54, (int)(fontMetrics().height()*3.5)+(toolbarLayout->spacing()*3)+(vSpace*2)));
+        toolbar->setFixedHeight(qMax(54, (int)(fontMetrics().height()*3.25)+(toolbarLayout->spacing()*3)+(vSpace*2)));
     }
     #endif