修复 FluentWindow 主题切换问题 (#437)

examples/gallery/app/common/signal_bus.py

@@ -7,7 +7,6 @@ class SignalBus(QObject):
 
     switchToSampleCard = pyqtSignal(str, int)
     micaEnableChanged = pyqtSignal(bool)
-    toggleThemeSignal = pyqtSignal()
     supportSignal = pyqtSignal()
 
 

examples/gallery/app/view/gallery_interface.py

@@ -5,7 +5,7 @@ from PyQt5.QtWidgets import QWidget, QLabel, QVBoxLayout, QHBoxLayout, QFrame
 
 from qfluentwidgets import (ScrollArea, PushButton, ToolButton, FluentIcon,
                             isDarkTheme, IconWidget, Theme, ToolTipFilter, TitleLabel, CaptionLabel,
-                            StrongBodyLabel, BodyLabel)
+                            StrongBodyLabel, BodyLabel, toggleTheme)
 from ..common.config import cfg, FEEDBACK_URL, HELP_URL, EXAMPLE_URL
 from ..common.icon import Icon
 from ..common.style_sheet import StyleSheet
@@ -82,7 +82,7 @@ class ToolBar(QWidget):
         self.supportButton.setToolTip(self.tr('Support me'))
         self.feedbackButton.setToolTip(self.tr('Send feedback'))
 
-        self.themeButton.clicked.connect(signalBus.toggleThemeSignal)
+        self.themeButton.clicked.connect(lambda: toggleTheme(True))
         self.supportButton.clicked.connect(signalBus.supportSignal)
         self.documentButton.clicked.connect(
             lambda: QDesktopServices.openUrl(QUrl(HELP_URL)))

examples/gallery/app/view/main_window.py

@@ -4,7 +4,7 @@ from PyQt5.QtGui import QIcon, QDesktopServices
 from PyQt5.QtWidgets import QApplication
 
 from qfluentwidgets import (NavigationAvatarWidget, NavigationItemPosition, MessageBox, FluentWindow,
-                            SplashScreen, Theme, setTheme, isDarkTheme)
+                            SplashScreen)
 from qfluentwidgets import FluentIcon as FIF
 
 from .gallery_interface import GalleryInterface
@@ -58,10 +58,8 @@ class MainWindow(FluentWindow):
         self.splashScreen.finish()
 
     def connectSignalToSlot(self):
-        cfg.themeChanged.connect(lambda: self.setMicaEffectEnabled(self.isMicaEffectEnabled()))
         signalBus.micaEnableChanged.connect(self.setMicaEffectEnabled)
         signalBus.switchToSampleCard.connect(self.switchToSample)
-        signalBus.toggleThemeSignal.connect(self.toggleTheme)
         signalBus.supportSignal.connect(self.onSupport)
 
     def initNavigation(self):
@@ -113,13 +111,6 @@ class MainWindow(FluentWindow):
         self.show()
         QApplication.processEvents()
 
-    def toggleTheme(self):
-        theme = Theme.LIGHT if isDarkTheme() else Theme.DARK
-        cfg.set(cfg.themeMode, theme)
-
-        if self.isMicaEffectEnabled():
-            self.windowEffect.setMicaEffect(self.winId(), isDarkTheme())
-
     def onSupport(self):
         w = MessageBox(
             '支持作者🥰',

examples/gallery/app/view/setting_interface.py

@@ -214,13 +214,13 @@ class SettingInterface(ScrollArea):
     def __connectSignalToSlot(self):
         """ connect signal to slot """
         cfg.appRestartSig.connect(self.__showRestartTooltip)
-        cfg.themeChanged.connect(setTheme)
 
         # music in the pc
         self.downloadFolderCard.clicked.connect(
             self.__onDownloadFolderCardClicked)
 
         # personalization
+        self.themeCard.optionChanged.connect(lambda ci: setTheme(cfg.get(ci)))
         self.themeColorCard.colorChanged.connect(setThemeColor)
         self.micaCard.checkedChanged.connect(signalBus.micaEnableChanged)
 

qfluentwidgets/common/__init__.py

@@ -3,7 +3,7 @@ from .font import setFont, getFont
 from .auto_wrap import TextWrap
 from .icon import Action, Icon, getIconColor, drawSvgIcon, FluentIcon, drawIcon, FluentIconBase, writeSvg
 from .style_sheet import (setStyleSheet, getStyleSheet, setTheme, ThemeColor, themeColor,
-                          setThemeColor, applyThemeColor, FluentStyleSheet, StyleSheetBase)
+                          setThemeColor, applyThemeColor, FluentStyleSheet, StyleSheetBase, toggleTheme)
 from .smooth_scroll import SmoothScroll, SmoothMode
 from .translator import FluentTranslator
 from .router import qrouter, Router
\ No newline at end of file

qfluentwidgets/common/config.py

@@ -258,6 +258,7 @@ class QConfig(QObject):
 
     appRestartSig = pyqtSignal()
     themeChanged = pyqtSignal(Theme)
+    themeChangedFinished = pyqtSignal()
     themeColorChanged = pyqtSignal(QColor)
 
     themeMode = OptionsConfigItem(

qfluentwidgets/common/style_sheet.py

@@ -195,6 +195,19 @@ def setTheme(theme: Theme, save=False):
     """
     qconfig.set(qconfig.themeMode, theme, save)
     updateStyleSheet()
+    qconfig.themeChangedFinished.emit()
+
+
+def toggleTheme(save=False):
+    """ toggle the theme of application
+
+    Parameters
+    ----------
+    save: bool
+        whether to save the change to config file
+    """
+    theme = Theme.LIGHT if isDarkTheme() else Theme.DARK
+    setTheme(theme, save)
 
 
 class ThemeColor(Enum):

qfluentwidgets/window/fluent_window.py

@@ -6,9 +6,10 @@ from PyQt5.QtCore import Qt
 from PyQt5.QtGui import QIcon, QPainter, QColor
 from PyQt5.QtWidgets import QWidget, QHBoxLayout, QVBoxLayout, QLabel
 
+from ..common.config import qconfig
 from ..common.icon import FluentIconBase
 from ..common.router import qrouter
-from ..common.style_sheet import FluentStyleSheet, isDarkTheme
+from ..common.style_sheet import FluentStyleSheet, isDarkTheme, setTheme, Theme
 from ..common.animation import BackgroundAnimationWidget
 from ..components.widgets.frameless_window import FramelessWindow
 from ..components.navigation import (NavigationInterface, NavigationBar, NavigationItemPosition,
@@ -38,6 +39,8 @@ class FluentWindowBase(BackgroundAnimationWidget, FramelessWindow):
         # enable mica effect on win11
         self.setMicaEffectEnabled(True)
 
+        qconfig.themeChangedFinished.connect(self._onThemeChangedFinished)
+
     def addSubInterface(self, interface: QWidget, icon: Union[FluentIconBase, QIcon, str], text: str,
                         position=NavigationItemPosition.TOP):
         """ add sub interface """
@@ -57,6 +60,10 @@ class FluentWindowBase(BackgroundAnimationWidget, FramelessWindow):
 
         return QColor(0, 0, 0, 0) if isDarkTheme() else QColor(255, 255, 255, 50)
 
+    def _onThemeChangedFinished(self):
+        if self.isMicaEffectEnabled():
+            self.windowEffect.setMicaEffect(self.winId(), isDarkTheme())
+
     def paintEvent(self, e):
         super().paintEvent(e)
         painter = QPainter(self)