From 90af3d295b9dd6f2edca90b6a3dc8008d073c52b Mon Sep 17 00:00:00 2001 From: Ilya Fedin Date: Tue, 30 Jun 2020 00:23:33 +0400 Subject: [PATCH] Always fallback to gtk icon theme To inherit icon theme even on WM-based environments --- Telegram/SourceFiles/platform/linux/linux_libs.cpp | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/Telegram/SourceFiles/platform/linux/linux_libs.cpp b/Telegram/SourceFiles/platform/linux/linux_libs.cpp index e0706f293..0d6a5bf1f 100644 --- a/Telegram/SourceFiles/platform/linux/linux_libs.cpp +++ b/Telegram/SourceFiles/platform/linux/linux_libs.cpp @@ -253,11 +253,10 @@ void start() { // change the icon theme only if it isn't already set by a platformtheme plugin // if QT_QPA_PLATFORMTHEME=(gtk2|gtk3), then force-apply the icon theme - if ((((QIcon::themeName() == qstr("hicolor") // QGenericUnixTheme + if (((QIcon::themeName() == qstr("hicolor") // QGenericUnixTheme && QIcon::fallbackThemeName() == qstr("hicolor")) || (QIcon::themeName() == qstr("Adwaita") // QGnomeTheme && QIcon::fallbackThemeName() == qstr("gnome"))) - && DesktopEnvironment::IsGtkBased()) || IsGtkIntegrationForced()) { DEBUG_LOG(("Set GTK icon theme")); QIcon::setThemeName(gtkSetting("gtk-icon-theme-name"));