smw/deskflow
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

refactor: move icon theme settings to styleUtils::updateIconTheme

Browse source
This commit is contained in:
sithlord48 2025-10-19 09:16:29 -04:00 committed by Chris Rizzitello
parent 91b836a486
commit 88e385d050
2 changed files with 13 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
src/apps/deskflow-gui/deskflow-gui.cpp
View file

@ -122,12 +122,7 @@ int main(int argc, char *argv[])
#endif #endif
// Sets the fallback icon path and fallback theme // Sets the fallback icon path and fallback theme
const auto themeName = QStringLiteral("deskflow-%1").arg(iconMode()); updateIconTheme();
if (QIcon::themeName().isEmpty())
QIcon::setThemeName(themeName);
else
QIcon::setFallbackThemeName(themeName);
QIcon::setFallbackSearchPaths({QStringLiteral(":/icons/%1").arg(themeName)});
qInstallMessageHandler(deskflow::gui::messages::messageHandler); qInstallMessageHandler(deskflow::gui::messages::messageHandler);
qInfo("%s v%s", kAppName, kDisplayVersion); qInfo("%s v%s", kAppName, kDisplayVersion);

12
src/lib/gui/StyleUtils.h
View file

@ -11,6 +11,8 @@
#include <QPalette> #include <QPalette>
#include <QStyleHints> #include <QStyleHints>
#include "common/Constants.h"
namespace deskflow::gui { namespace deskflow::gui {
/** /**
@ -35,4 +37,14 @@ inline QString iconMode()
return isDarkMode() ? QStringLiteral("dark") : QStringLiteral("light"); return isDarkMode() ? QStringLiteral("dark") : QStringLiteral("light");
} }
inline void updateIconTheme()
{
// Sets the fallback icon path and fallback theme
const auto themeName = QStringLiteral("%1-%2").arg(kAppId, iconMode());
if (QIcon::themeName().isEmpty() || QIcon::themeName().startsWith(kAppId))
QIcon::setThemeName(themeName);
else
QIcon::setFallbackThemeName(themeName);
QIcon::setFallbackSearchPaths({QStringLiteral(":/icons/%1").arg(themeName)});
}
} // namespace deskflow::gui } // namespace deskflow::gui