From 969d87ec5118e93517cf0427d157c44961155a4a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Martin=20T=C5=AFma?= Date: Sat, 14 May 2016 09:28:56 +0200 Subject: [PATCH] Improved toolbar style handling --- src/gui.cpp | 15 ++++++--------- 1 file changed, 6 insertions(+), 9 deletions(-) diff --git a/src/gui.cpp b/src/gui.cpp index 98d85503..1f822776 100644 --- a/src/gui.cpp +++ b/src/gui.cpp @@ -367,30 +367,27 @@ void GUI::createMenus() void GUI::createToolBars() { +#ifdef Q_OS_MAC + setToolButtonStyle(Qt::ToolButtonTextUnderIcon); +#else // Q_OS_MAC + setToolButtonStyle(Qt::ToolButtonFollowStyle); +#endif // Q_OS_MAC + _fileToolBar = addToolBar(tr("File")); _fileToolBar->addAction(_openFileAction); _fileToolBar->addAction(_saveFileAction); _fileToolBar->addAction(_reloadFileAction); _fileToolBar->addAction(_closeFileAction); -#ifdef Q_OS_MAC - _fileToolBar->setToolButtonStyle(Qt::ToolButtonTextUnderIcon); -#endif // Q_OS_MAC _showToolBar = addToolBar(tr("Show")); _showToolBar->addAction(_showPOIAction); _showToolBar->addAction(_showMapAction); -#ifdef Q_OS_MAC - _showToolBar->setToolButtonStyle(Qt::ToolButtonTextUnderIcon); -#endif // Q_OS_MAC _navigationToolBar = addToolBar(tr("Navigation")); _navigationToolBar->addAction(_firstAction); _navigationToolBar->addAction(_prevAction); _navigationToolBar->addAction(_nextAction); _navigationToolBar->addAction(_lastAction); -#ifdef Q_OS_MAC - _navigationToolBar->setToolButtonStyle(Qt::ToolButtonTextUnderIcon); -#endif // Q_OS_MAC } void GUI::createTrackView()