From 2ec39c9d97a6ee9ecd5d4d65c49a63827b571e8f Mon Sep 17 00:00:00 2001 From: Sergey Yaroslavtsev Date: Tue, 10 Feb 2026 17:38:54 +0100 Subject: [PATCH 1/3] switch to PySide6==6.7.3 and force dpi to 96 for windows --- .github/workflows/_WindowsInstaller.yml | 2 +- src/PyMca5/PyMcaGui/pymca/PyMcaMain.py | 8 ++++++++ 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/.github/workflows/_WindowsInstaller.yml b/.github/workflows/_WindowsInstaller.yml index f2def8b74..b070adbf8 100644 --- a/.github/workflows/_WindowsInstaller.yml +++ b/.github/workflows/_WindowsInstaller.yml @@ -37,7 +37,7 @@ jobs: pip install $(python -c "import glob; print(' '.join(glob.glob('wheels/*cp313*.whl')))") pip install Cython pip install numpy==2.2.6 - pip install Pyside6==6.9.1 + pip install Pyside6==6.8.3 pip install h5py pip install fisx pip install hdf5plugin diff --git a/src/PyMca5/PyMcaGui/pymca/PyMcaMain.py b/src/PyMca5/PyMcaGui/pymca/PyMcaMain.py index 2e2e68a42..3a884c3f8 100644 --- a/src/PyMca5/PyMcaGui/pymca/PyMcaMain.py +++ b/src/PyMca5/PyMcaGui/pymca/PyMcaMain.py @@ -191,6 +191,14 @@ if sys.platform == 'win32': _ = os.environ.setdefault("QT_QPA_PLATFORM", "windows:darkmode=0") + + # to forbid font changes if windows scale is not 100% + if sys.platform == 'win32': + os.environ["QT_ENABLE_HIGHDPI_SCALING"] = "0" + os.environ["QT_SCALE_FACTOR"] = "1" + os.environ["QT_AUTO_SCREEN_SCALE_FACTOR"] = "0" + os.environ["QT_FONT_DPI"] = "96" # it is not absolute value - it is windows "100%" value + app = qt.QApplication(sys.argv) # To avoid "Dark mode"; without this part some menus will be still dark From aaf5dda98b44df86b5eb91d9b686de1d5f4eb57b Mon Sep 17 00:00:00 2001 From: Sergey Yaroslavtsev Date: Fri, 13 Feb 2026 09:43:17 +0100 Subject: [PATCH 2/3] minimal fix for plots, but not for subwindow ratio - no forced DPI=96 --- src/PyMca5/PyMcaGui/pymca/PyMcaMain.py | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/src/PyMca5/PyMcaGui/pymca/PyMcaMain.py b/src/PyMca5/PyMcaGui/pymca/PyMcaMain.py index 3a884c3f8..2e00efd09 100644 --- a/src/PyMca5/PyMcaGui/pymca/PyMcaMain.py +++ b/src/PyMca5/PyMcaGui/pymca/PyMcaMain.py @@ -192,12 +192,9 @@ _ = os.environ.setdefault("QT_QPA_PLATFORM", "windows:darkmode=0") - # to forbid font changes if windows scale is not 100% + # minimal fix matplotlib fonts when Windows scale (DPI) is not 100% if sys.platform == 'win32': os.environ["QT_ENABLE_HIGHDPI_SCALING"] = "0" - os.environ["QT_SCALE_FACTOR"] = "1" - os.environ["QT_AUTO_SCREEN_SCALE_FACTOR"] = "0" - os.environ["QT_FONT_DPI"] = "96" # it is not absolute value - it is windows "100%" value app = qt.QApplication(sys.argv) From e2819d236811710248a32b67a80dd58a30928bf5 Mon Sep 17 00:00:00 2001 From: Sergey Yaroslavtsev Date: Fri, 13 Feb 2026 15:41:49 +0100 Subject: [PATCH 3/3] rebased with master --- src/PyMca5/PyMcaGui/pymca/PyMcaMain.py | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/src/PyMca5/PyMcaGui/pymca/PyMcaMain.py b/src/PyMca5/PyMcaGui/pymca/PyMcaMain.py index 2e00efd09..d3c22cf54 100644 --- a/src/PyMca5/PyMcaGui/pymca/PyMcaMain.py +++ b/src/PyMca5/PyMcaGui/pymca/PyMcaMain.py @@ -187,14 +187,11 @@ if __name__ == "__main__": sys.excepthook = qt.exceptionHandler - # To avoid "Dark mode"; this force main windows to be light (but not all submenus) if sys.platform == 'win32': + # To avoid "Dark mode"; this force main windows to be light (but not all submenus) _ = os.environ.setdefault("QT_QPA_PLATFORM", "windows:darkmode=0") - - - # minimal fix matplotlib fonts when Windows scale (DPI) is not 100% - if sys.platform == 'win32': - os.environ["QT_ENABLE_HIGHDPI_SCALING"] = "0" + # minimal fix for matplotlib fonts when Windows scale (DPI) is not 100% + _ = os.environ["QT_ENABLE_HIGHDPI_SCALING"] = "0" app = qt.QApplication(sys.argv)