From b2acb5c326c0fc86386ee88d31bee0c1d20ddca6 Mon Sep 17 00:00:00 2001 From: itsmattkc Date: Sun, 3 May 2020 17:15:09 +1000 Subject: [PATCH] style: use native menu styling on macOS too --- app/ui/style/style.cpp | 10 +++++++--- app/ui/style/style.h | 4 +--- app/widget/menu/menu.cpp | 4 +--- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/app/ui/style/style.cpp b/app/ui/style/style.cpp index 832202450..06753432e 100644 --- a/app/ui/style/style.cpp +++ b/app/ui/style/style.cpp @@ -45,14 +45,18 @@ QList StyleManager::ListInternal() return style_list; } -#ifdef Q_OS_WINDOWS -void StyleManager::UseNativeWindowsStyling(QWidget *widget) +void StyleManager::UseOSNativeStyling(QWidget *widget) { +#if defined(Q_OS_WINDOWS) QStyle* s = QStyleFactory::create(QStringLiteral("windowsvista")); widget->setStyle(s); widget->setPalette(s->standardPalette()); -} +#elif defined(Q_OS_MAC) + QStyle* s = QStyleFactory::create(QStringLiteral("macintosh")); + widget->setStyle(s); + widget->setPalette(s->standardPalette()); #endif +} QPalette StyleManager::ParsePalette(const QString& ini_path) { diff --git a/app/ui/style/style.h b/app/ui/style/style.h index 77f980263..23dbc4e9c 100644 --- a/app/ui/style/style.h +++ b/app/ui/style/style.h @@ -54,9 +54,7 @@ public: static QList ListInternal(); -#ifdef Q_OS_WINDOWS - static void UseNativeWindowsStyling(QWidget* widget); -#endif + static void UseOSNativeStyling(QWidget* widget); private: static QPalette ParsePalette(const QString& ini_path); diff --git a/app/widget/menu/menu.cpp b/app/widget/menu/menu.cpp index 5515c65da..b744c3d32 100644 --- a/app/widget/menu/menu.cpp +++ b/app/widget/menu/menu.cpp @@ -110,9 +110,7 @@ void Menu::SetBooleanAction(QAction *a, bool* boolean) void Menu::Init() { -#ifdef Q_OS_WINDOWS - StyleManager::UseNativeWindowsStyling(this); -#endif + StyleManager::UseOSNativeStyling(this); } OLIVE_NAMESPACE_EXIT