Skip to content

Commit aa7198f

Browse files
committed
[WIP] Weak sources, preview indicator, clean up
1 parent ae61f5e commit aa7198f

File tree

10 files changed

+934
-514
lines changed

10 files changed

+934
-514
lines changed

frontend/data/locale/en-US.ini

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1340,6 +1340,13 @@ Basic.AudioMixer.KeepHiddenBottom="Keep hidden sources at the bottom"
13401340
Basic.AudioMixer.ShowInactive="Show inactive sources"
13411341
Basic.AudioMixer.KeepInactiveRight="Keep inactive sources to the right"
13421342
Basic.AudioMixer.KeepInactiveBottom="Keep inactive sources at the bottom"
1343+
Basic.AudioMixer.Category.Global="Global"
1344+
Basic.AudioMixer.Category.Pinned="Pinned"
1345+
Basic.AudioMixer.Category.Active="Active"
1346+
Basic.AudioMixer.Category.Inactive="Inactive"
1347+
Basic.AudioMixer.Category.Preview="Preview"
1348+
Basic.AudioMixer.Category.Hidden="Hidden"
1349+
Basic.AudioMixer.Category.Unassigned="Unassigned"
13431350

13441351
# advanced audio properties
13451352
Basic.AdvAudio="Advanced Audio Properties"

frontend/data/themes/Yami.obt

Lines changed: 23 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1700,10 +1700,16 @@ VolumeName {
17001700
background: transparent;
17011701
font-size: var(--font_small);
17021702
padding: 1px var(--padding_base);
1703+
border: 1px solid transparent;
1704+
}
1705+
1706+
VolumeName:focus {
1707+
border: 1px solid var(--button_border_hover);
17031708
}
17041709

17051710
VolumeName:hover {
1706-
background: var(--input_bg_hover);
1711+
background: var(--button_bg_hover);
1712+
border: 1px solid var(--button_border_hover);
17071713
}
17081714

17091715
VolControl #volLabel {
@@ -1716,31 +1722,33 @@ VolControl #volLabel {
17161722

17171723
/* Horizontal Mixer */
17181724
#hVolumeWidgets VolControl {
1719-
padding: 0px 0px var(--padding_base);
1725+
padding: 0px 0px;
17201726
border-bottom: 1px solid var(--border_color);
1727+
margin-bottom: 0px;
17211728
}
17221729

17231730
#hVolumeWidgets .mixer-category {
1724-
min-width: 72px;
1725-
border-right: 1px solid var(--border_color);
1726-
border-bottom: 1px solid var(--border_color);
1731+
min-width: 72px;
1732+
margin: var(--spacing_base);
1733+
border-radius: var(--border_radius);
17271734
}
17281735

17291736
#hVolumeWidgets VolumeName {
1730-
padding: var(--padding_base) var(--padding_large);
1731-
border-bottom: 1px solid var(--border_color);
1737+
padding: var(--padding_xlarge) var(--padding_xlarge);
1738+
margin: 0px var(--spacing_base) var(--spacing_base);
17321739
}
17331740

17341741
#hVolumeWidgets #volLabel {
1735-
border-bottom: 1px solid var(--border_color);
1742+
margin: var(--spacing_base);
1743+
border-radius: var(--border_radius);
17361744
}
17371745

17381746
#hVolumeWidgets #volMeterFrame {
1739-
margin-top: var(--spacing_large);
1747+
margin-bottom: var(--padding_xlarge);
17401748
}
17411749

17421750
#hVolumeWidgets VolControl QSlider {
1743-
margin: 0px 0px var(--padding_base);
1751+
margin: var(--padding_large) 0px var(--padding_xlarge);
17441752
}
17451753

17461754
#hVolumeWidgets VolControl QSlider::groove:horizontal {
@@ -1756,11 +1764,6 @@ VolControl #volLabel {
17561764
padding: 0 var(--padding_xlarge);
17571765
}
17581766

1759-
#hVolumeWidgets VolControl #volLabel {
1760-
min-width: 64px;
1761-
border-left: 1px solid var(--border_color);
1762-
}
1763-
17641767
/* Vertical Mixer */
17651768
#vVolumeWidgets VolControl {
17661769
padding: 0px 0px var(--padding_container);
@@ -1850,6 +1853,11 @@ VolControl.volume-inactive .mixer-category {
18501853
color: var(--text_muted);
18511854
}
18521855

1856+
VolControl.volume-preview .mixer-category {
1857+
background: var(--green6);
1858+
color: var(--green1);
1859+
}
1860+
18531861
#stackedMixerArea VolControl.volume-hidden QSlider::groove,
18541862
#stackedMixerArea VolControl.volume-inactive QSlider::groove {
18551863
background: var(--grey8);

0 commit comments

Comments
 (0)