Merge branch 'Mudlet:development' into ircServerPassword

Mudlet · Dec 3, 2021 · 94a1804 · 94a1804
2 parents da19e36 + 0e25764
commit 94a1804
Show file tree

Hide file tree

Showing 3 changed files with 657 additions and 596 deletions.
diff --git a/src/main.cpp b/src/main.cpp
@@ -487,7 +487,7 @@ int main(int argc, char* argv[])
         QFile::link(homeDirectory, homeLink);
     }
 #endif
-    app->setStyle(new AltFocusMenuBarDisable);
+
     mudlet::start();
 
     if (first_launch) {

diff --git a/src/mudlet.cpp b/src/mudlet.cpp
@@ -267,14 +267,16 @@ mudlet::mudlet()
     }
 
     qApp->setAttribute(Qt::AA_UseHighDpiPixmaps);
-    setAppearance(mAppearance, true);
+    // We need to record this before we clobber it with our own substitute...
     mDefaultStyle = qApp->style()->objectName();
+    // ... which is applied here:
+    setAppearance(mAppearance, true);
 
     scanForMudletTranslations(QStringLiteral(":/lang"));
     scanForQtTranslations(getMudletPath(qtTranslationsPath));
     loadTranslators(mInterfaceLanguage);
 
-  if (QStringList{"windowsvista", "macintosh"}.contains(mDefaultStyle, Qt::CaseInsensitive)) {
+    if (QStringList{"windowsvista", "macintosh"}.contains(mDefaultStyle, Qt::CaseInsensitive)) {
         qDebug().nospace().noquote() << "mudlet::mudlet() INFO - '" << mDefaultStyle << "' has been detected as the style factory in use - QPushButton styling fix applied!";
         mBG_ONLY_STYLESHEET = QStringLiteral("QPushButton {background-color: %1; border: 1px solid #8f8f91;}");
         mTEXT_ON_BG_STYLESHEET = QStringLiteral("QPushButton {color: %1; background-color: %2; border: 1px solid #8f8f91;}");