From c49e23d7b1ebb3936aef06267f266dbff546e959 Mon Sep 17 00:00:00 2001 From: Kishi85 Date: Tue, 26 May 2026 08:13:40 +0200 Subject: [PATCH] refactor: Move platform specific code from QtTrayMenu to tray_linux --- src/QtTrayMenu.cpp | 5 ----- src/tray_linux.cpp | 6 ++++++ 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/src/QtTrayMenu.cpp b/src/QtTrayMenu.cpp index 78166545..621bc109 100644 --- a/src/QtTrayMenu.cpp +++ b/src/QtTrayMenu.cpp @@ -27,11 +27,6 @@ QtTrayMenu::QtTrayMenu(QObject *parent, const bool debug): QtTrayMenu::QtTrayMenu(int argc, char **argv, QObject *parent, const bool debug): QObject(parent) { - if (qgetenv("WAYLAND_DISPLAY").isEmpty() && qgetenv("DISPLAY").isEmpty()) { - // Force fallback to QT platform minimal if no (WAYLAND_)DISPLAY was found - qputenv("QT_QPA_PLATFORM", QByteArrayLiteral("minimal")); - qWarning("QtTrayMenu: no reachable WAYLAND_DISPLAY or DISPLAY endpoint, forcing QT_QPA_PLATFORM=minimal"); - } if (QApplication::instance()) { app = dynamic_cast(QApplication::instance()); if (!app) { diff --git a/src/tray_linux.cpp b/src/tray_linux.cpp index 3334e76b..905b46ce 100644 --- a/src/tray_linux.cpp +++ b/src/tray_linux.cpp @@ -176,6 +176,12 @@ extern "C" { int tray_init(struct tray *tray) { if (tray_linux::qt_tray_menu == nullptr) { + // Check if a (wayland_)display is set or fallback to minimal QPA platform + if (qgetenv("WAYLAND_DISPLAY").isEmpty() && qgetenv("DISPLAY").isEmpty()) { + // Force fallback to QT platform minimal if no (WAYLAND_)DISPLAY was found + qputenv("QT_QPA_PLATFORM", QByteArrayLiteral("minimal")); + qWarning("QtTrayMenu: no reachable WAYLAND_DISPLAY or DISPLAY endpoint, forcing QT_QPA_PLATFORM=minimal"); + } // Create a new unique pointer to QtTrayMenu instance tray_linux::qt_tray_menu = std::make_unique(); }