[Theme] Pass application palette when generating disabled icon pixmap (#7831)

Co-authored-by: Lukas Brübach <44814898+BruebachL@users.noreply.github.com> Co-authored-by: sentry[bot] <39604003+sentry[bot]@users.noreply.github.com>
2026-11-09 19:43:26 -08:00 · 2026-11-09 21:34:08 +01:00 · 2026-11-09 21:34:08 +01:00 · f089414f1c
commit f089414f1c
parent 3b379618c3
2 changed files with 34 additions and 1 deletions
--- a/cockatrice/src/interface/theme_icon.cpp
+++ b/cockatrice/src/interface/theme_icon.cpp
@ -24,6 +24,7 @@
 #include <QString>
 #include <QStringLiteral>
 #include <QStyle>
+#include <QStyleOption>
 #include <QSvgRenderer>
 #include <QtGlobal>
 #include <utility>
@ -318,7 +319,11 @@ private:
            }
        }
        if (mode == QIcon::Disabled && !pixmap.isNull()) {
-            pixmap = QApplication::style()->generatedIconPixmap(QIcon::Disabled, pixmap, nullptr);
+            // QCommonStyle reads the disabled colors from the option's palette
+            // without a null check, so a null option crashes in QPalette::brush.
+            QStyleOption option;
+            option.palette = qApp->palette();
+            pixmap = QApplication::style()->generatedIconPixmap(QIcon::Disabled, pixmap, &option);
        }
        return pixmap;
    }