Merge pull request #504 from amnweb/refactor/python-3.13-upgrade

refactor(widgets) add support for python 3.14

Author: amnweb

.github/workflows/windows-dev.yaml

@@ -17,7 +17,7 @@ permissions:
   contents: read
 
 env:
-  PYTHON_VERSION: '3.12'
+  PYTHON_VERSION: '3.14'
 
 jobs:
   build:
@@ -74,7 +74,7 @@ jobs:
         .\venv\Scripts\Activate
         python -m pip install --upgrade pip
         pip install --force --no-cache .
-        pip install --force --no-cache --upgrade cx_Freeze==7.2.10
+        pip install --extra-index-url https://test.pypi.org/simple/ cx_Freeze --pre --no-cache
       shell: pwsh
 
     - name: Build EXE

.github/workflows/windows.yaml

@@ -7,7 +7,7 @@ permissions:
   contents: read
 
 env:
-  PYTHON_VERSION: '3.12'
+  PYTHON_VERSION: '3.14'
 
 jobs:
   build:
@@ -36,7 +36,7 @@ jobs:
         .\venv\Scripts\Activate
         python -m pip install --upgrade pip
         pip install --force --no-cache .
-        pip install --force --no-cache --upgrade cx_Freeze==7.2.10
+        pip install --force --no-cache --upgrade cx_Freeze
       shell: pwsh
 
     - name: Build EXE

docs/widgets/(Widget)-Power-Menu.md

@@ -89,8 +89,8 @@ power_menu:
     margin: 0px;
 }
 .power-menu-popup .button.hover {
-    background-color: #191919;
-    border: 4px solid #191919;
+    background-color: #1d1d1d;
+    border: 4px solid #1d1d1d;
 }
 .power-menu-popup .button .label {
     margin-bottom: 8px;
@@ -110,13 +110,14 @@ power_menu:
 .power-menu-popup .button.cancel .icon {
     padding: 0;
     margin: 0;
+    max-height: 0;
 }
 .power-menu-popup .button.cancel .label {
     color:  #f38ba8;
     margin: 0;
 }
 .power-menu-popup .button.cancel {
-    height: 32px;
+    height: 40px;
     border-radius: 4px;
 }
 .power-menu-popup .button.cancel.hover .label {

pyproject.toml

@@ -11,11 +11,9 @@ authors = [
 ]
 license = { file = "LICENSE" }
 readme = "README.md"
-requires-python = "==3.12.*"
+requires-python = ">= 3.13"
 dependencies = [
-    "PyQt6==6.9.1",
-    "PyQt6-Qt6==6.9.1",
-    "PyQt6_sip",
+    "pyqt6>=6.9.1",
     "cerberus",
     "humanize",
     "psutil",
@@ -26,7 +24,7 @@ dependencies = [
     "holidays",
     "watchdog",
     "pycaw",
-    "pillow==11.1",
+    "pillow",
     "icoextract",
     "qasync",
     "obs-websocket-py",
@@ -56,7 +54,9 @@ dependencies = [
 dev = [
     "pre-commit",
     "ruff",
-    "cx_Freeze==7.2.10"
+    "cx_freeze",
+    "pyqt6-stubs",
+    "types-pillow",
 ]
 
 [tool.hatch.metadata]

src/build.py

@@ -58,7 +58,7 @@
     "silent_level": 1,
     "silent": True,
     "excludes": ["PySide6", "pydoc_data", "email", "tkinter", "PyQt5", "PySide2", "unittest"],
-    "bin_excludes": ["Qt6Pdf.dll", "Qt6PdfWidgets.dll"],
+    "bin_excludes": ["Qt6Pdf.dll", "_avif.cp314-win_amd64.pyd"],
     "zip_exclude_packages": ["*"],
     "build_exe": "dist",
     "include_msvcr": True,

src/core/bar.py

@@ -1,7 +1,7 @@
 import logging
 
 import win32con
-from PyQt6.QtCore import QEasingCurve, QEvent, QPropertyAnimation, QRect, Qt, pyqtSignal
+from PyQt6.QtCore import QEasingCurve, QEvent, QPropertyAnimation, QRect, Qt, QTimer, pyqtSignal
 from PyQt6.QtGui import QScreen
 from PyQt6.QtWidgets import QFrame, QGridLayout, QHBoxLayout, QWidget
 
@@ -108,6 +108,11 @@ def __init__(
 
         self.position_bar(init)
         self.monitor_hwnd = get_monitor_hwnd(int(self.winId()))
+
+        if self._is_auto_width:
+            self._sync_auto_width()
+            self._bar_frame.installEventFilter(self)
+
         self._add_widgets(widgets)
 
         if not self._window_flags["windows_app_bar"]:
@@ -138,7 +143,7 @@ def __init__(
             self._autohide_manager = AutoHideManager(self, self)
             self._autohide_manager.setup_autohide()
 
-        self.show()
+        QTimer.singleShot(0, self.show)
 
     @property
     def bar_id(self) -> str:
@@ -151,6 +156,9 @@ def on_geometry_changed(self, geo: QRect) -> None:
         if self._autohide_manager and self._autohide_manager.is_enabled():
             self._autohide_manager.setup_detection_zone()
 
+        if self._is_auto_width:
+            QTimer.singleShot(0, self._sync_auto_width)
+
     def try_add_app_bar(self, scale_screen_height=False) -> None:
         if self.app_bar_manager:
             self.app_bar_manager.create_appbar(
@@ -203,8 +211,8 @@ def position_bar(self, init=False) -> None:
 
         scale_state = self.screen().devicePixelRatio() > 1.0
 
-        if str(self._dimensions["width"]).lower() == "auto":
-            bar_width = max(self._bar_frame.sizeHint().width(), 0)
+        if self._is_auto_width:
+            bar_width = self._update_auto_width()
 
         elif is_valid_percentage_str(str(self._dimensions["width"])):
             percent = percent_to_float(self._dimensions["width"])
@@ -221,6 +229,46 @@ def position_bar(self, init=False) -> None:
         self._bar_frame.setGeometry(0, 0, bar_width, bar_height)
         self.try_add_app_bar(scale_screen_height=scale_state)
 
+    def _update_auto_width(self) -> int:
+        """Calculate the current auto width based on the layout's size hint."""
+        layout = self._bar_frame.layout()
+        if layout:
+            layout.activate()
+
+        requested = max(self._bar_frame.sizeHint().width(), 0)
+        available = self.screen().geometry().width() - self._padding["left"] - self._padding["right"]
+        new_width = min(requested, available)
+        self._current_auto_width = new_width
+        return new_width
+
+    def _apply_auto_width(self, new_width: int) -> None:
+        """Resize and reposition the bar using the supplied auto width."""
+        if new_width < 0:
+            return
+
+        bar_height = self._dimensions["height"]
+        screen_geometry = self.screen().geometry()
+        bar_x, bar_y = self.bar_pos(
+            new_width,
+            bar_height,
+            screen_geometry.width(),
+            screen_geometry.height(),
+        )
+
+        self.setGeometry(bar_x, bar_y, new_width, bar_height)
+        self._bar_frame.setGeometry(0, 0, new_width, bar_height)
+
+    def _sync_auto_width(self) -> None:
+        """Ensure auto width matches the layout after a DPI/geometry."""
+        if not self._is_auto_width:
+            return
+
+        previous_width = self._current_auto_width
+        new_width = self._update_auto_width()
+
+        if new_width != previous_width or self.width() != new_width:
+            self._apply_auto_width(new_width)
+
     def _add_widgets(self, widgets: dict[str, list] = None):
         bar_layout = QGridLayout()
         bar_layout.setContentsMargins(0, 0, 0, 0)
@@ -257,9 +305,6 @@ def _add_widgets(self, widgets: dict[str, list] = None):
 
         self._bar_frame.setLayout(bar_layout)
 
-        if self._is_auto_width:
-            self._bar_frame.installEventFilter(self)
-
     def show_bar(self):
         self.setWindowOpacity(0.0)
         self.opacity_animation = QPropertyAnimation(self, b"windowOpacity")
@@ -310,24 +355,10 @@ def changeEvent(self, event: QEvent) -> None:
 
     def eventFilter(self, obj, event):
         if self._is_auto_width and obj == self._bar_frame and event.type() == QEvent.Type.LayoutRequest:
-            requested = max(self._bar_frame.sizeHint().width(), 0)
-            available = self.screen().geometry().width() - self._padding["left"] - self._padding["right"]
-            new_width = min(requested, available)
-            if new_width != self._current_auto_width:
-                self._current_auto_width = new_width
-                bar_height = self.height()
-                self.resize(new_width, bar_height)
-                self._bar_frame.resize(new_width, bar_height)
-
-                screen_geometry = self.screen().geometry()
-                bar_x, bar_y = self.bar_pos(
-                    new_width,
-                    bar_height,
-                    screen_geometry.width(),
-                    screen_geometry.height(),
-                )
-                if self.x() != bar_x or self.y() != bar_y:
-                    self.move(bar_x, bar_y)
+            previous_width = self._current_auto_width
+            new_width = self._update_auto_width()
+            if new_width != previous_width:
+                self._apply_auto_width(new_width)
 
         return super().eventFilter(obj, event)
 

src/core/bar_helper.py

@@ -22,6 +22,7 @@
 )
 
 from core.utils.controller import exit_application, reload_application
+from core.utils.utilities import refresh_widget_style
 from core.utils.win32.bindings import DwmGetWindowAttribute
 from core.utils.win32.constants import DWMWA_CLOAKED, S_OK
 from core.utils.win32.utilities import get_monitor_hwnd, get_window_rect, qmenu_rounded_corners
@@ -437,11 +438,9 @@ def update_theme_class(self):
 
     def _update_styles(self, widget):
         """Update styles for widget and its children by unpolishing and re-polishing"""
-        widget.style().unpolish(widget)
-        widget.style().polish(widget)
+        refresh_widget_style(widget)
         for child in widget.findChildren(QWidget):
-            child.style().unpolish(child)
-            child.style().polish(child)
+            refresh_widget_style(child)
 
 
 class BarContextMenu:

src/core/tray.py

@@ -86,10 +86,10 @@ def _load_context_menu(self):
         QMenu {
             background-color: #202020;
             color: #ffffff;
-            border:1px solid #373b3e;
+            border:1px solid #303030;
             padding:5px 0;
             margin:0;
-            border-radius:4px
+            border-radius:8px
         }
         QMenu::item {
             margin:0 4px;

src/core/ui/windows/about.py

@@ -20,7 +20,7 @@
 from core.ui.style import apply_button_style, apply_link_button_style
 from core.ui.windows.update_dialog import ReleaseFetcher, ReleaseInfo, UpdateDialog
 from core.utils.tooltip import set_tooltip
-from core.utils.utilities import get_app_identifier, is_valid_qobject
+from core.utils.utilities import get_app_identifier, is_valid_qobject, refresh_widget_style
 from settings import (
     APP_ID,
     APP_NAME,
@@ -209,8 +209,7 @@ def _refresh_update_button_style(self) -> None:
         state = self._update_button.property("updateState") or "idle"
         variant = "primary" if state == "available" else "secondary"
         apply_button_style(self._update_button, variant)
-        self._update_button.style().unpolish(self._update_button)
-        self._update_button.style().polish(self._update_button)
+        refresh_widget_style(self._update_button)
 
     def _apply_state(
         self,
@@ -332,8 +331,7 @@ def _disable_update_capability(self) -> None:
         set_tooltip(self._update_button, config["tooltip"], 0, position="top")
 
         apply_button_style(self._update_button, "secondary")
-        self._update_button.style().unpolish(self._update_button)
-        self._update_button.style().polish(self._update_button)
+        refresh_widget_style(self._update_button)
 
     def showEvent(self, event) -> None:
         self._apply_palette()

src/core/ui/windows/update_dialog.py

@@ -30,7 +30,7 @@
 
 from core.ui.style import apply_button_style
 from core.utils.controller import exit_application
-from core.utils.utilities import is_process_running, is_valid_qobject
+from core.utils.utilities import is_process_running, is_valid_qobject, refresh_widget_style
 from settings import APP_NAME, SCRIPT_PATH
 
 GITHUB_LATEST_RELEASE_URL = "https://api.github.com/repos/amnweb/yasb/releases/latest"
@@ -487,8 +487,7 @@ def showEvent(self, event) -> None:
     def event(self, event) -> bool:
         if event.type() == QEvent.Type.PaletteChange:
             self._apply_button_styles()
-            self.changelog_view.style().unpolish(self.changelog_view)
-            self.changelog_view.style().polish(self.changelog_view)
+            refresh_widget_style(self.changelog_view)
         return super().event(event)
 
     def present(self) -> None: