Gabriel20xx/VisionFlowAutomator
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Refactor title bar theming logic; reduce multiple attempts to single application for improved efficiency

Browse Source
This commit is contained in:
Gabriel20xx
2025-07-31 15:29:28 +02:00
parent 2abc71347f
commit be5f538a69
1 changed files with 3 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files
main.py
+3 -26
View File
@@ -1412,12 +1412,9 @@ class MainWindow(QtWidgets.QMainWindow):
self.apply_theme() self.apply_theme()
self._update_theme_combo_text() self._update_theme_combo_text()
# Apply title bar theming with multiple attempts to ensure it works # Apply title bar theming once more to ensure it takes effect
is_dark = self.get_effective_dark_mode() is_dark = self.get_effective_dark_mode()
self.apply_dark_title_bar(is_dark) self.apply_dark_title_bar(is_dark)
QtCore.QTimer.singleShot(100, lambda: self.apply_dark_title_bar(is_dark))
QtCore.QTimer.singleShot(300, lambda: self.apply_dark_title_bar(is_dark))
QtCore.QTimer.singleShot(1000, lambda: self.apply_dark_title_bar(is_dark))
# Start theme monitoring if in system mode # Start theme monitoring if in system mode
if self.theme_mode == 'system': if self.theme_mode == 'system':
@@ -1866,11 +1863,9 @@ class MainWindow(QtWidgets.QMainWindow):
def showEvent(self, event): def showEvent(self, event):
"""Handle window show event to ensure title bar theming is applied.""" """Handle window show event to ensure title bar theming is applied."""
super().showEvent(event) super().showEvent(event)
# Apply title bar theming when window is shown with multiple attempts # Apply title bar theming when window is shown (once only)
is_dark = self.get_effective_dark_mode() is_dark = self.get_effective_dark_mode()
QtCore.QTimer.singleShot(50, lambda: self.apply_dark_title_bar(is_dark)) QtCore.QTimer.singleShot(50, lambda: self.apply_dark_title_bar(is_dark))
QtCore.QTimer.singleShot(150, lambda: self.apply_dark_title_bar(is_dark))
QtCore.QTimer.singleShot(300, lambda: self.apply_dark_title_bar(is_dark))
def changeEvent(self, event): def changeEvent(self, event):
"""Handle window state changes (maximize/minimize).""" """Handle window state changes (maximize/minimize)."""
@@ -2094,19 +2089,10 @@ class MainWindow(QtWidgets.QMainWindow):
if result == 0: # S_OK if result == 0: # S_OK
logger.debug(f"Applied Windows {'dark' if enable_dark else 'light'} title bar ({'newer' if use_newer_api else 'legacy'} API)") logger.debug(f"Applied Windows {'dark' if enable_dark else 'light'} title bar ({'newer' if use_newer_api else 'legacy'} API)")
# Force immediate window redraw using multiple methods # Force immediate window redraw
self.update() self.update()
self.repaint() self.repaint()
# Force a window refresh by briefly changing and restoring window flags
try:
original_flags = self.windowFlags()
self.setWindowFlags(original_flags | QtCore.Qt.WindowType.WindowStaysOnTopHint)
self.setWindowFlags(original_flags)
self.show()
except:
pass
return True return True
else: else:
logger.debug(f"Windows title bar API returned error code: {result}") logger.debug(f"Windows title bar API returned error code: {result}")
@@ -2128,15 +2114,6 @@ class MainWindow(QtWidgets.QMainWindow):
self.update() self.update()
self.repaint() self.repaint()
# Force window refresh
try:
original_flags = self.windowFlags()
self.setWindowFlags(original_flags | QtCore.Qt.WindowType.WindowStaysOnTopHint)
self.setWindowFlags(original_flags)
self.show()
except:
pass
return True return True
except Exception as fallback_e: except Exception as fallback_e:
logger.debug(f"Windows dark title bar fallback failed: {fallback_e}") logger.debug(f"Windows dark title bar fallback failed: {fallback_e}")