From ba6a6bfdcb4db6fdee02b0224df4106321c5ef48 Mon Sep 17 00:00:00 2001 From: gxalpha Date: Wed, 9 Oct 2024 20:02:27 +0200 Subject: [PATCH] UI/themes: Consistently select indicator-mute instead of MuteCheckBox cb026964b00c366943a3c16dfb1511eafc24c035 changed most instances of MuteCheckBox as a selector for the button that mutes/unmutes a source in the mixer to indicator-mute, but left a few instances of the old selector, especially in variant themes while the base theme got changed. This lead to competing selections where apparently indicator-mute won which meant that the variant themes wouldn't override the base. Changing all instances of MuteCheckBox to to indicator-mute fixes this and hopefully prevents future uses of MuteCheckBox as a selector anywhere. --- UI/data/themes/System.obt | 2 +- UI/data/themes/Yami.obt | 6 +++--- UI/data/themes/Yami_Acri.ovt | 14 +++++++------- UI/data/themes/Yami_Classic.ovt | 14 +++++++------- UI/data/themes/Yami_Light.ovt | 16 ++++++++-------- UI/data/themes/Yami_Rachni.ovt | 14 +++++++------- 6 files changed, 33 insertions(+), 33 deletions(-) diff --git a/UI/data/themes/System.obt b/UI/data/themes/System.obt index c927034856c977..d410715a9f2dbd 100644 --- a/UI/data/themes/System.obt +++ b/UI/data/themes/System.obt @@ -84,7 +84,7 @@ qproperty-icon: url(:res/images/revert.svg); } -MuteCheckBox { +.indicator-mute { outline: none; } diff --git a/UI/data/themes/Yami.obt b/UI/data/themes/Yami.obt index 6aea6ed6b85f81..de668a327790fc 100644 --- a/UI/data/themes/Yami.obt +++ b/UI/data/themes/Yami.obt @@ -1413,7 +1413,7 @@ VolControl #volLabel { margin-right: var(--padding_xlarge); } -#vMixerScrollArea VolControl MuteCheckBox { +#vMixerScrollArea VolControl .indicator-mute { margin-left: var(--padding_xlarge); } @@ -1624,7 +1624,7 @@ QGroupBox::indicator:unchecked:disabled { /* Mute CheckBox */ -MuteCheckBox { +.indicator-mute { outline: none; } @@ -1992,4 +1992,4 @@ OBSBasicAdvAudio #scrollAreaWidgetContents { #previewYScrollBar { width: 16px; -} \ No newline at end of file +} diff --git a/UI/data/themes/Yami_Acri.ovt b/UI/data/themes/Yami_Acri.ovt index 5b1c11795bedc1..978400a7d186af 100644 --- a/UI/data/themes/Yami_Acri.ovt +++ b/UI/data/themes/Yami_Acri.ovt @@ -103,21 +103,21 @@ QToolButton:pressed:hover { border-color: var(--toolbutton_bg_down); } -MuteCheckBox::indicator, -MuteCheckBox::indicator:unchecked, -MuteCheckBox::indicator:focus { +.indicator-mute::indicator, +.indicator-mute::indicator:unchecked, +.indicator-mute::indicator:focus { background-color: var(--toolbutton_bg); border: 1px solid var(--toolbutton_bg); } -MuteCheckBox::indicator:hover, -MuteCheckBox::indicator:unchecked:hover { +.indicator-mute::indicator:hover, +.indicator-mute::indicator:unchecked:hover { background-color: var(--toolbutton_bg_hover); border: 1px solid var(--toolbutton_bg_hover); } -MuteCheckBox::indicator:pressed, -MuteCheckBox::indicator:pressed:hover { +.indicator-mute::indicator:pressed, +.indicator-mute::indicator:pressed:hover { background-color: var(--toolbutton_bg_down); border-color: var(--toolbutton_bg_down); } diff --git a/UI/data/themes/Yami_Classic.ovt b/UI/data/themes/Yami_Classic.ovt index 045507a9db18c3..3163765335394e 100644 --- a/UI/data/themes/Yami_Classic.ovt +++ b/UI/data/themes/Yami_Classic.ovt @@ -270,8 +270,8 @@ QPushButton[toolButton="true"] { font-size: var(--font_base); } -MuteCheckBox::indicator, -MuteCheckBox::indicator:unchecked { +.indicator-mute::indicator, +.indicator-mute::indicator:unchecked { background-color: var(--bg_base); border: none; width: var(--icon_base_mixer); @@ -279,17 +279,17 @@ MuteCheckBox::indicator:unchecked { icon-size: var(--icon_base_mixer); } -MuteCheckBox::indicator:checked { +.indicator-mute::indicator:checked { background-color: var(--bg_base); } -MuteCheckBox::indicator:checked:hover, -MuteCheckBox::indicator:unchecked:hover { +.indicator-mute::indicator:checked:hover, +.indicator-mute::indicator:unchecked:hover { background-color: var(--bg_base); } -MuteCheckBox::indicator:hover, -MuteCheckBox::indicator:unchecked:hover { +.indicator-mute::indicator:hover, +.indicator-mute::indicator:unchecked:hover { icon-size: var(--icon_base_mixer); border: none; } diff --git a/UI/data/themes/Yami_Light.ovt b/UI/data/themes/Yami_Light.ovt index 1002450676c871..e9bf87686229b3 100644 --- a/UI/data/themes/Yami_Light.ovt +++ b/UI/data/themes/Yami_Light.ovt @@ -196,35 +196,35 @@ QGroupBox::indicator:unchecked:disabled { image: url(theme:Light/visible.svg); } -MuteCheckBox::indicator:checked { +.indicator-mute::indicator:checked { image: url(theme:Light/mute.svg); } -MuteCheckBox::indicator:unchecked { +.indicator-mute::indicator:unchecked { image: url(theme:Light/settings/audio.svg); } -MuteCheckBox::indicator:unchecked:hover { +.indicator-mute::indicator:unchecked:hover { image: url(theme:Light/settings/audio.svg); } -MuteCheckBox::indicator:unchecked:focus { +.indicator-mute::indicator:unchecked:focus { image: url(theme:Light/settings/audio.svg); } -MuteCheckBox::indicator:checked:hover { +.indicator-mute::indicator:checked:hover { image: url(theme:Light/mute.svg); } -MuteCheckBox::indicator:checked:focus { +.indicator-mute::indicator:checked:focus { image: url(theme:Light/mute.svg); } -MuteCheckBox::indicator:checked:disabled { +.indicator-mute::indicator:checked:disabled { image: url(theme:Light/mute.svg); } -MuteCheckBox::indicator:unchecked:disabled { +.indicator-mute::indicator:unchecked:disabled { image: url(theme:Light/settings/audio.svg); } diff --git a/UI/data/themes/Yami_Rachni.ovt b/UI/data/themes/Yami_Rachni.ovt index 7f6fa4ae078563..bb0b2b0c9df295 100644 --- a/UI/data/themes/Yami_Rachni.ovt +++ b/UI/data/themes/Yami_Rachni.ovt @@ -141,21 +141,21 @@ QToolButton:pressed:hover { border-color: var(--toolbutton_bg_down); } -MuteCheckBox::indicator, -MuteCheckBox::indicator:unchecked, -MuteCheckBox::indicator:focus { +.indicator-mute::indicator, +.indicator-mute::indicator:unchecked, +.indicator-mute::indicator:focus { background-color: var(--toolbutton_bg); border: 1px solid var(--toolbutton_bg); } -MuteCheckBox::indicator:hover, -MuteCheckBox::indicator:unchecked:hover { +.indicator-mute::indicator:hover, +.indicator-mute::indicator:unchecked:hover { background-color: var(--toolbutton_bg_hover); border: 1px solid var(--toolbutton_bg_hover); } -MuteCheckBox::indicator:pressed, -MuteCheckBox::indicator:pressed:hover { +.indicator-mute::indicator:pressed, +.indicator-mute::indicator:pressed:hover { background-color: var(--toolbutton_bg_down); border-color: var(--toolbutton_bg_down); }