From 9b49a060af8b2a0afe96a796951f5994d382a6e3 Mon Sep 17 00:00:00 2001 From: Mercury13 Date: Sun, 27 Oct 2024 21:13:33 +0200 Subject: [PATCH] Dark mode with both CSS and colours --- Libs/SelfMade/i_DarkMode.cpp | 23 +++++++++++++---------- 1 file changed, 13 insertions(+), 10 deletions(-) diff --git a/Libs/SelfMade/i_DarkMode.cpp b/Libs/SelfMade/i_DarkMode.cpp index 0a02419f1..1a9260ed2 100644 --- a/Libs/SelfMade/i_DarkMode.cpp +++ b/Libs/SelfMade/i_DarkMode.cpp @@ -5,7 +5,7 @@ #include #include -QString dark::fileName = ":/dark.qss"; +QString dark::fileName; std::optional dark::palette; namespace { @@ -104,16 +104,19 @@ void dark::forceOn() { if (palette) { QApplication::setPalette(*palette); + isDarkOn = true; + } + if (!fileName.isEmpty()) { + QFile f(fileName); + if ( !f.exists() ) { + forceOff(); + return; + } + f.open( QFile::ReadOnly | QFile::Text ); + QTextStream ts( &f ); + getApp()->setStyleSheet( ts.readAll() ); + isDarkOn = true; } - // QFile f(fileName); - // if ( !f.exists() ) { - // forceOff(); - // return; - // } - // f.open( QFile::ReadOnly | QFile::Text ); - // QTextStream ts( &f ); - // getApp()->setStyleSheet( ts.readAll() ); - isDarkOn = true; }