Skip to content

Commit

Permalink
UI/themes: Consistently select indicator-mute instead of MuteCheckBox
Browse files Browse the repository at this point in the history
cb02696 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.
  • Loading branch information
gxalpha authored and RytoEX committed Oct 11, 2024
1 parent 88cd7b7 commit ba6a6bf
Show file tree
Hide file tree
Showing 6 changed files with 33 additions and 33 deletions.
2 changes: 1 addition & 1 deletion UI/data/themes/System.obt
Original file line number Diff line number Diff line change
Expand Up @@ -84,7 +84,7 @@
qproperty-icon: url(:res/images/revert.svg);
}

MuteCheckBox {
.indicator-mute {
outline: none;
}

Expand Down
6 changes: 3 additions & 3 deletions UI/data/themes/Yami.obt
Original file line number Diff line number Diff line change
Expand Up @@ -1413,7 +1413,7 @@ VolControl #volLabel {
margin-right: var(--padding_xlarge);
}

#vMixerScrollArea VolControl MuteCheckBox {
#vMixerScrollArea VolControl .indicator-mute {
margin-left: var(--padding_xlarge);
}

Expand Down Expand Up @@ -1624,7 +1624,7 @@ QGroupBox::indicator:unchecked:disabled {

/* Mute CheckBox */

MuteCheckBox {
.indicator-mute {
outline: none;
}

Expand Down Expand Up @@ -1992,4 +1992,4 @@ OBSBasicAdvAudio #scrollAreaWidgetContents {

#previewYScrollBar {
width: 16px;
}
}
14 changes: 7 additions & 7 deletions UI/data/themes/Yami_Acri.ovt
Original file line number Diff line number Diff line change
Expand Up @@ -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);
}
Expand Down
14 changes: 7 additions & 7 deletions UI/data/themes/Yami_Classic.ovt
Original file line number Diff line number Diff line change
Expand Up @@ -270,26 +270,26 @@ 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);
height: var(--icon_base_mixer);
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;
}
Expand Down
16 changes: 8 additions & 8 deletions UI/data/themes/Yami_Light.ovt
Original file line number Diff line number Diff line change
Expand Up @@ -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);
}

Expand Down
14 changes: 7 additions & 7 deletions UI/data/themes/Yami_Rachni.ovt
Original file line number Diff line number Diff line change
Expand Up @@ -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);
}
Expand Down

0 comments on commit ba6a6bf

Please sign in to comment.