From ae42e0d6f97aca7ec4d8bbd1aa7ea27f972016b5 Mon Sep 17 00:00:00 2001 From: Alex Huszagh Date: Mon, 2 May 2022 13:46:11 -0500 Subject: [PATCH] Revert QAbstractSlider to QSlider. Only 3 widgets subclass QAbstractSlider: QSlider, QScrollBar, and QDial. We cannot style QDial, and QSlider is the only one we want styled, with our separate customizations for QScrollbar. Closes #53. --- dist/pyqt6/dark/stylesheet.qss | 50 ++++++++++++++++++++------------- dist/pyqt6/light/stylesheet.qss | 50 ++++++++++++++++++++------------- dist/qrc/dark/stylesheet.qss | 50 ++++++++++++++++++++------------- dist/qrc/light/stylesheet.qss | 50 ++++++++++++++++++++------------- template/stylesheet.qss.in | 50 ++++++++++++++++++++------------- 5 files changed, 150 insertions(+), 100 deletions(-) diff --git a/dist/pyqt6/dark/stylesheet.qss b/dist/pyqt6/dark/stylesheet.qss index 7cb4d3f..52e5595 100644 --- a/dist/pyqt6/dark/stylesheet.qss +++ b/dist/pyqt6/dark/stylesheet.qss @@ -854,6 +854,16 @@ QTreeView:hover:pressed background-color: #31363b; } +QColumnView +{ + border: 0.04em transparent #31363b; +} + +QColumnView:hover +{ + border: 0.04em transparent #3daee9; +} + QComboBox:hover:pressed:editable { background-color: #1d2023; @@ -1697,8 +1707,8 @@ QTreeView::item:!selected:hover padding: 0.13em; } -QAbstractSlider::handle:horizontal, -QAbstractSlider::handle:vertical +QSlider::handle:horizontal, +QSlider::handle:vertical { background: #1d2023; border: 0.04em solid #626568; @@ -1707,67 +1717,67 @@ QAbstractSlider::handle:vertical border-radius: 0.35em; } -QAbstractSlider:horizontal +QSlider:horizontal { height: 2em; } -QAbstractSlider:vertical +QSlider:vertical { width: 2em; } -QAbstractSlider::handle:horizontal +QSlider::handle:horizontal { margin: -0.23em 0; } -QAbstractSlider::handle:vertical +QSlider::handle:vertical { margin: 0 -0.23em; } -QAbstractSlider::groove:horizontal, -QAbstractSlider::groove:vertical +QSlider::groove:horizontal, +QSlider::groove:vertical { background: #2c3034; border: 0em solid #31363b; border-radius: 0.19em; } -QAbstractSlider::groove:horizontal +QSlider::groove:horizontal { height: 0.4em; } -QAbstractSlider::groove:vertical +QSlider::groove:vertical { width: 0.4em; } -QAbstractSlider::handle:horizontal:hover, -QAbstractSlider::handle:horizontal:focus, -QAbstractSlider::handle:vertical:hover, -QAbstractSlider::handle:vertical:focus +QSlider::handle:horizontal:hover, +QSlider::handle:horizontal:focus, +QSlider::handle:vertical:hover, +QSlider::handle:vertical:focus { border: 0.04em solid #3daee9; } -QAbstractSlider::handle:horizontal:!focus:!hover, -QAbstractSlider::handle:vertical:!focus:!hover +QSlider::handle:horizontal:!focus:!hover, +QSlider::handle:vertical:!focus:!hover { border: 0.04em solid #626568; } -QAbstractSlider::sub-page:horizontal, -QAbstractSlider::add-page:vertical +QSlider::sub-page:horizontal, +QSlider::add-page:vertical { background: #3daee9; border-radius: 0.19em; } -QAbstractSlider::add-page:horizontal, -QAbstractSlider::sub-page:vertical +QSlider::add-page:horizontal, +QSlider::sub-page:vertical { background: #626568; border-radius: 0.19em; diff --git a/dist/pyqt6/light/stylesheet.qss b/dist/pyqt6/light/stylesheet.qss index cd941ba..14cb270 100644 --- a/dist/pyqt6/light/stylesheet.qss +++ b/dist/pyqt6/light/stylesheet.qss @@ -854,6 +854,16 @@ QTreeView:hover:pressed background-color: #eff0f1; } +QColumnView +{ + border: 0.04em transparent #eff0f1; +} + +QColumnView:hover +{ + border: 0.04em transparent rgba(51, 164, 223, 0.5); +} + QComboBox:hover:pressed:editable { background-color: #eff0f1; @@ -1697,8 +1707,8 @@ QTreeView::item:!selected:hover padding: 0.13em; } -QAbstractSlider::handle:horizontal, -QAbstractSlider::handle:vertical +QSlider::handle:horizontal, +QSlider::handle:vertical { background: #eff0f1; border: 0.04em solid rgba(106, 105, 105, 0.7); @@ -1707,67 +1717,67 @@ QAbstractSlider::handle:vertical border-radius: 0.35em; } -QAbstractSlider:horizontal +QSlider:horizontal { height: 2em; } -QAbstractSlider:vertical +QSlider:vertical { width: 2em; } -QAbstractSlider::handle:horizontal +QSlider::handle:horizontal { margin: -0.23em 0; } -QAbstractSlider::handle:vertical +QSlider::handle:vertical { margin: 0 -0.23em; } -QAbstractSlider::groove:horizontal, -QAbstractSlider::groove:vertical +QSlider::groove:horizontal, +QSlider::groove:vertical { background: #d9d8d7; border: 0em solid #eff0f1; border-radius: 0.19em; } -QAbstractSlider::groove:horizontal +QSlider::groove:horizontal { height: 0.4em; } -QAbstractSlider::groove:vertical +QSlider::groove:vertical { width: 0.4em; } -QAbstractSlider::handle:horizontal:hover, -QAbstractSlider::handle:horizontal:focus, -QAbstractSlider::handle:vertical:hover, -QAbstractSlider::handle:vertical:focus +QSlider::handle:horizontal:hover, +QSlider::handle:horizontal:focus, +QSlider::handle:vertical:hover, +QSlider::handle:vertical:focus { border: 0.04em solid #3daef3; } -QAbstractSlider::handle:horizontal:!focus:!hover, -QAbstractSlider::handle:vertical:!focus:!hover +QSlider::handle:horizontal:!focus:!hover, +QSlider::handle:vertical:!focus:!hover { border: 0.04em solid rgba(106, 105, 105, 0.7); } -QAbstractSlider::sub-page:horizontal, -QAbstractSlider::add-page:vertical +QSlider::sub-page:horizontal, +QSlider::add-page:vertical { background: #3daef3; border-radius: 0.19em; } -QAbstractSlider::add-page:horizontal, -QAbstractSlider::sub-page:vertical +QSlider::add-page:horizontal, +QSlider::sub-page:vertical { background: rgba(106, 105, 105, 0.7); border-radius: 0.19em; diff --git a/dist/qrc/dark/stylesheet.qss b/dist/qrc/dark/stylesheet.qss index fbbb9dd..1138692 100644 --- a/dist/qrc/dark/stylesheet.qss +++ b/dist/qrc/dark/stylesheet.qss @@ -854,6 +854,16 @@ QTreeView:hover:pressed background-color: #31363b; } +QColumnView +{ + border: 0.04em transparent #31363b; +} + +QColumnView:hover +{ + border: 0.04em transparent #3daee9; +} + QComboBox:hover:pressed:editable { background-color: #1d2023; @@ -1697,8 +1707,8 @@ QTreeView::item:!selected:hover padding: 0.13em; } -QAbstractSlider::handle:horizontal, -QAbstractSlider::handle:vertical +QSlider::handle:horizontal, +QSlider::handle:vertical { background: #1d2023; border: 0.04em solid #626568; @@ -1707,67 +1717,67 @@ QAbstractSlider::handle:vertical border-radius: 0.35em; } -QAbstractSlider:horizontal +QSlider:horizontal { height: 2em; } -QAbstractSlider:vertical +QSlider:vertical { width: 2em; } -QAbstractSlider::handle:horizontal +QSlider::handle:horizontal { margin: -0.23em 0; } -QAbstractSlider::handle:vertical +QSlider::handle:vertical { margin: 0 -0.23em; } -QAbstractSlider::groove:horizontal, -QAbstractSlider::groove:vertical +QSlider::groove:horizontal, +QSlider::groove:vertical { background: #2c3034; border: 0em solid #31363b; border-radius: 0.19em; } -QAbstractSlider::groove:horizontal +QSlider::groove:horizontal { height: 0.4em; } -QAbstractSlider::groove:vertical +QSlider::groove:vertical { width: 0.4em; } -QAbstractSlider::handle:horizontal:hover, -QAbstractSlider::handle:horizontal:focus, -QAbstractSlider::handle:vertical:hover, -QAbstractSlider::handle:vertical:focus +QSlider::handle:horizontal:hover, +QSlider::handle:horizontal:focus, +QSlider::handle:vertical:hover, +QSlider::handle:vertical:focus { border: 0.04em solid #3daee9; } -QAbstractSlider::handle:horizontal:!focus:!hover, -QAbstractSlider::handle:vertical:!focus:!hover +QSlider::handle:horizontal:!focus:!hover, +QSlider::handle:vertical:!focus:!hover { border: 0.04em solid #626568; } -QAbstractSlider::sub-page:horizontal, -QAbstractSlider::add-page:vertical +QSlider::sub-page:horizontal, +QSlider::add-page:vertical { background: #3daee9; border-radius: 0.19em; } -QAbstractSlider::add-page:horizontal, -QAbstractSlider::sub-page:vertical +QSlider::add-page:horizontal, +QSlider::sub-page:vertical { background: #626568; border-radius: 0.19em; diff --git a/dist/qrc/light/stylesheet.qss b/dist/qrc/light/stylesheet.qss index 84f5e90..7e2155f 100644 --- a/dist/qrc/light/stylesheet.qss +++ b/dist/qrc/light/stylesheet.qss @@ -854,6 +854,16 @@ QTreeView:hover:pressed background-color: #eff0f1; } +QColumnView +{ + border: 0.04em transparent #eff0f1; +} + +QColumnView:hover +{ + border: 0.04em transparent rgba(51, 164, 223, 0.5); +} + QComboBox:hover:pressed:editable { background-color: #eff0f1; @@ -1697,8 +1707,8 @@ QTreeView::item:!selected:hover padding: 0.13em; } -QAbstractSlider::handle:horizontal, -QAbstractSlider::handle:vertical +QSlider::handle:horizontal, +QSlider::handle:vertical { background: #eff0f1; border: 0.04em solid rgba(106, 105, 105, 0.7); @@ -1707,67 +1717,67 @@ QAbstractSlider::handle:vertical border-radius: 0.35em; } -QAbstractSlider:horizontal +QSlider:horizontal { height: 2em; } -QAbstractSlider:vertical +QSlider:vertical { width: 2em; } -QAbstractSlider::handle:horizontal +QSlider::handle:horizontal { margin: -0.23em 0; } -QAbstractSlider::handle:vertical +QSlider::handle:vertical { margin: 0 -0.23em; } -QAbstractSlider::groove:horizontal, -QAbstractSlider::groove:vertical +QSlider::groove:horizontal, +QSlider::groove:vertical { background: #d9d8d7; border: 0em solid #eff0f1; border-radius: 0.19em; } -QAbstractSlider::groove:horizontal +QSlider::groove:horizontal { height: 0.4em; } -QAbstractSlider::groove:vertical +QSlider::groove:vertical { width: 0.4em; } -QAbstractSlider::handle:horizontal:hover, -QAbstractSlider::handle:horizontal:focus, -QAbstractSlider::handle:vertical:hover, -QAbstractSlider::handle:vertical:focus +QSlider::handle:horizontal:hover, +QSlider::handle:horizontal:focus, +QSlider::handle:vertical:hover, +QSlider::handle:vertical:focus { border: 0.04em solid #3daef3; } -QAbstractSlider::handle:horizontal:!focus:!hover, -QAbstractSlider::handle:vertical:!focus:!hover +QSlider::handle:horizontal:!focus:!hover, +QSlider::handle:vertical:!focus:!hover { border: 0.04em solid rgba(106, 105, 105, 0.7); } -QAbstractSlider::sub-page:horizontal, -QAbstractSlider::add-page:vertical +QSlider::sub-page:horizontal, +QSlider::add-page:vertical { background: #3daef3; border-radius: 0.19em; } -QAbstractSlider::add-page:horizontal, -QAbstractSlider::sub-page:vertical +QSlider::add-page:horizontal, +QSlider::sub-page:vertical { background: rgba(106, 105, 105, 0.7); border-radius: 0.19em; diff --git a/template/stylesheet.qss.in b/template/stylesheet.qss.in index 98f9b61..b07ea62 100644 --- a/template/stylesheet.qss.in +++ b/template/stylesheet.qss.in @@ -854,6 +854,16 @@ QTreeView:hover:pressed background-color: ^background^; } +QColumnView +{ + border: 0.04em transparent ^background^; +} + +QColumnView:hover +{ + border: 0.04em transparent ^highlight^; +} + QComboBox:hover:pressed:editable { background-color: ^text:background^; @@ -1697,8 +1707,8 @@ QTreeView::item:!selected:hover padding: 0.13em; } -QAbstractSlider::handle:horizontal, -QAbstractSlider::handle:vertical +QSlider::handle:horizontal, +QSlider::handle:vertical { background: ^slider:handle:background^; border: 0.04em solid ^midtone:dark^; @@ -1707,67 +1717,67 @@ QAbstractSlider::handle:vertical border-radius: 0.35em; } -QAbstractSlider:horizontal +QSlider:horizontal { height: 2em; } -QAbstractSlider:vertical +QSlider:vertical { width: 2em; } -QAbstractSlider::handle:horizontal +QSlider::handle:horizontal { margin: -0.23em 0; } -QAbstractSlider::handle:vertical +QSlider::handle:vertical { margin: 0 -0.23em; } -QAbstractSlider::groove:horizontal, -QAbstractSlider::groove:vertical +QSlider::groove:horizontal, +QSlider::groove:vertical { background: ^tab:background^; border: 0em solid ^background^; border-radius: 0.19em; } -QAbstractSlider::groove:horizontal +QSlider::groove:horizontal { height: 0.4em; } -QAbstractSlider::groove:vertical +QSlider::groove:vertical { width: 0.4em; } -QAbstractSlider::handle:horizontal:hover, -QAbstractSlider::handle:horizontal:focus, -QAbstractSlider::handle:vertical:hover, -QAbstractSlider::handle:vertical:focus +QSlider::handle:horizontal:hover, +QSlider::handle:horizontal:focus, +QSlider::handle:vertical:hover, +QSlider::handle:vertical:focus { border: 0.04em solid ^slider:foreground^; } -QAbstractSlider::handle:horizontal:!focus:!hover, -QAbstractSlider::handle:vertical:!focus:!hover +QSlider::handle:horizontal:!focus:!hover, +QSlider::handle:vertical:!focus:!hover { border: 0.04em solid ^midtone:dark^; } -QAbstractSlider::sub-page:horizontal, -QAbstractSlider::add-page:vertical +QSlider::sub-page:horizontal, +QSlider::add-page:vertical { background: ^slider:foreground^; border-radius: 0.19em; } -QAbstractSlider::add-page:horizontal, -QAbstractSlider::sub-page:vertical +QSlider::add-page:horizontal, +QSlider::sub-page:vertical { background: ^midtone:dark^; border-radius: 0.19em;