Skip to content

Commit

Permalink
[themes] Force fusion style for non-default UI themes on OS X
Browse files Browse the repository at this point in the history
  • Loading branch information
nirvn committed Jan 10, 2019
1 parent c263750 commit c7abba0
Showing 1 changed file with 0 additions and 2 deletions.
2 changes: 0 additions & 2 deletions src/app/main.cpp
Expand Up @@ -1223,7 +1223,6 @@ int main( int argc, char *argv[] )
// Set the application style. If it's not set QT will use the platform style except on Windows // Set the application style. If it's not set QT will use the platform style except on Windows
// as it looks really ugly so we use QPlastiqueStyle. // as it looks really ugly so we use QPlastiqueStyle.
QString desiredStyle = settings.value( QStringLiteral( "qgis/style" ) ).toString(); QString desiredStyle = settings.value( QStringLiteral( "qgis/style" ) ).toString();
#ifndef Q_OS_MACX
const QString theme = settings.value( QStringLiteral( "UI/UITheme" ) ).toString(); const QString theme = settings.value( QStringLiteral( "UI/UITheme" ) ).toString();
if ( theme != QLatin1String( "default" ) ) if ( theme != QLatin1String( "default" ) )
{ {
Expand All @@ -1232,7 +1231,6 @@ int main( int argc, char *argv[] )
desiredStyle = QStringLiteral( "fusion" ); desiredStyle = QStringLiteral( "fusion" );
} }
} }
#endif
const QString activeStyleName = QApplication::style()->metaObject()->className(); const QString activeStyleName = QApplication::style()->metaObject()->className();
if ( desiredStyle.contains( QLatin1String( "adwaita" ), Qt::CaseInsensitive ) if ( desiredStyle.contains( QLatin1String( "adwaita" ), Qt::CaseInsensitive )
|| ( desiredStyle.isEmpty() && activeStyleName.contains( QLatin1String( "adwaita" ), Qt::CaseInsensitive ) ) ) || ( desiredStyle.isEmpty() && activeStyleName.contains( QLatin1String( "adwaita" ), Qt::CaseInsensitive ) ) )
Expand Down

0 comments on commit c7abba0

Please sign in to comment.