Optimize for pyqt5

5yutan5 · Aug 29, 2021 · 12fe3d2 · 12fe3d2
1 parent b716db0
commit 12fe3d2
Show file tree

Hide file tree

Showing 5 changed files with 49 additions and 27 deletions.
diff --git a/README.md b/README.md
@@ -49,6 +49,12 @@ app.exec()
 
 ```
 
+> ⚠ The quality of image may be low on Qt5(PyQt5, PySide2) due to the use of svg.
+You can add the following [attribute](https://doc.qt.io/qt-5/qt.html#ApplicationAttribute-enum) to improve the quality of images.
+> ```Python
+> app.setAttribute(Qt.ApplicationAttribute.AA_UseHighDpiPixmaps)
+> ```
+
 ### Light theme
 
 ```Python

diff --git a/qdarktheme/Qt/qt_compat.py b/qdarktheme/Qt/qt_compat.py
@@ -30,7 +30,7 @@ def _get_loaded_api() -> Optional[str]:
     importing any other Qt-binding is unsafe.
     Returns
     -------
-    None, 'PySide6', 'PyQt6', 'PySide2', 'PyQt5'
+    None, 'PySide6', 'PyQt6', 'PyQt5', 'PySide2'
     """
     for api in _API_LIST:
         if sys.modules.get(f"{api}.QtCore"):
@@ -50,7 +50,7 @@ def _get_installed_api() -> Optional[str]:
 
     Returns
     -------
-    None, 'PySide6', 'PyQt6', 'PySide2', 'PyQt5'
+    None, 'PySide6', 'PyQt6', 'PyQt5', 'PySide2'
     """
     # Fix [AttributeError: module 'importlib' has no attribute 'util']
     # See https://stackoverflow.com/a/39661116/13452582

diff --git a/qdarktheme/examples/sidebar/__main__.py b/qdarktheme/examples/sidebar/__main__.py
@@ -1,12 +1,17 @@
 import sys
 
 import qdarktheme
+from qdarktheme.Qt.qt_compat import QT_API
 from qdarktheme.Qt.QtCore import Qt
 from qdarktheme.Qt.QtGui import QAction, QActionGroup
 from qdarktheme.Qt.QtWidgets import QApplication, QLabel, QMainWindow, QStackedWidget, QToolBar
 from qdarktheme.resource_manager import get_icon
 
 app = QApplication(sys.argv)
+# Fix the svg icon display becoming low quality in Qt5.
+# Exclude PyQt6 because it doesn't have this attribute.
+if QT_API != "PyQt6":
+    app.setAttribute(Qt.ApplicationAttribute.AA_UseHighDpiPixmaps)
 main_win = QMainWindow()
 
 # Create action

diff --git a/qdarktheme/examples/widget_gallery/__main__.py b/qdarktheme/examples/widget_gallery/__main__.py
@@ -2,9 +2,15 @@
 
 import qdarktheme
 from qdarktheme.examples.widget_gallery.mainwindow import WidgetGallery
+from qdarktheme.Qt.qt_compat import QT_API
+from qdarktheme.Qt.QtCore import Qt
 from qdarktheme.Qt.QtWidgets import QApplication
 
 app = QApplication(sys.argv)
+# Fix the svg icon display becoming low quality in Qt5.
+# Exclude PyQt6 because it doesn't have this attribute.
+if QT_API != "PyQt6":
+    app.setAttribute(Qt.ApplicationAttribute.AA_UseHighDpiPixmaps)
 win = WidgetGallery()
 win.menuBar().setNativeMenuBar(False)
 app.setStyleSheet(qdarktheme.load_stylesheet())

diff --git a/qdarktheme/template.qss b/qdarktheme/template.qss
@@ -341,10 +341,14 @@ QMenu::icon {
     height: 14px;
 }
 QMenu::right-arrow {
+    image: url("qdarktheme:svg/${main_theme}/chevron_right_24dp.svg");
     margin: 2px;
     padding-left: 12px;
-    height: 9px;
-    width: 9px;
+    height: 20px;
+    width: 20px;
+}
+QMenu::right-arrow:disabled {
+    image: url("qdarktheme:svg/${main_theme}/chevron_right_disabled_24dp.svg");
 }
 
 /* QScrollBar -------------------------------------------------------------
@@ -468,23 +472,6 @@ QToolButton:checked {
 QToolButton::checked:disabled {
     background-color: $button-disabled;
 }
-QToolButton[popupMode="0"] {
-    padding-right: 2px;
-}
-QToolButton[popupMode="1"] {
-    padding-right: 20px;
-}
-QToolButton[popupMode="1"]::menu-button {
-    border: none;
-}
-QToolButton[popupMode="1"]::menu-button:hover {
-    border: none;
-    border-left: 1px solid $highlight;
-    border-radius: 0;
-}
-QToolButton[popupMode="2"] {
-    padding-right: 2px;
-}
 QToolButton::menu-button {
     padding: 2px;
     border-radius: 4px;
@@ -496,10 +483,14 @@ QToolButton::menu-button:hover, QToolButton::menu-button:checked:hover {
     border: 1px solid $highlight;
 }
 QToolButton::menu-indicator {
-    height: 8px;
-    width: 8px;
-    top: 0;
-    left: -2px;
+    image: url("qdarktheme:svg/${main_theme}/expand_more_24dp.svg");
+    height: 18px;
+    width: 18px;
+    top: 6px;
+    left: 3px;
+}
+QToolButton::menu-indicator:disabled {
+    image: url("qdarktheme:svg/${main_theme}/expand_more_disabled_24dp.svg")
 }
 QToolButton::menu-arrow {
     height: 8px;
@@ -532,7 +523,7 @@ QComboBox::down-arrow {
     width: 23px;
 }
 QComboBox::down-arrow:disabled {
-    image: url("qdarktheme:svg/${main_theme}/expand_more_disabled_24dp.svg")
+    image: url("qdarktheme:svg/${main_theme}/expand_more_disabled_24dp.svg");
 }
 
 QComboBox QAbstractItemView {
@@ -940,6 +931,20 @@ QHeaderView::section:vertical {
 QHeaderView::section::last, QHeaderView::section::only-one {
     margin: 0;
 }
+QHeaderView::down-arrow {
+    image: url("qdarktheme:svg/${main_theme}/expand_more_24dp.svg");
+    width: 20px;
+}
+QHeaderView::down-arrow:disabled {
+    image: url("qdarktheme:svg/${main_theme}/expand_more_disabled_24dp.svg")
+}
+QHeaderView::up-arrow {
+    image: url("qdarktheme:svg/${main_theme}/expand_less_24dp.svg");
+    width: 20px;
+}
+QHeaderView::up-arrow:disabled {
+    image: url("qdarktheme:svg/${main_theme}/expand_less_disabled_24dp.svg")
+}
 
 /* QTableView -------------------------------------------------------------
 
@@ -1163,7 +1168,7 @@ QPushButton[type="contained"]:checked {
 QPushButton[type="contained"]:disabled {
     border-color: $contained-button-disabled;
     background-color: $contained-button-disabled;
-    color: $text;
+    color: $text-disabled;
 }
 
 /* === Text button === */