fix: place the volume level under the progress and in the bottom bar
On now playing it is centred under the progress bar. The bottom bar on the other screens shows it too, at the right after the time and play state. Its number has a fixed width: with only a minimum, the row gave it the spare space and pushed the time into the middle.
This commit is contained in:
+57
-29
@@ -567,6 +567,49 @@ component Speaker {
|
||||
}
|
||||
}
|
||||
|
||||
// A quiet speaker, bar and number for the current volume.
|
||||
component VolumeLevel inherits HorizontalLayout {
|
||||
in property <int> level;
|
||||
in property <bool> muted;
|
||||
in property <length> font-size: 13px * Theme.s;
|
||||
spacing: 10px * Theme.s;
|
||||
// Its own width only, so a stretching row does not hand it the slack.
|
||||
horizontal-stretch: 0;
|
||||
|
||||
VerticalLayout {
|
||||
alignment: center;
|
||||
Speaker {
|
||||
muted: root.muted || root.level == 0;
|
||||
tint: Theme.muted;
|
||||
size: 14px * Theme.s;
|
||||
}
|
||||
}
|
||||
VerticalLayout {
|
||||
alignment: center;
|
||||
Rectangle {
|
||||
width: 90px * Theme.s;
|
||||
height: 4px * Theme.s;
|
||||
border-radius: 2px * Theme.s;
|
||||
background: Theme.raised;
|
||||
Rectangle {
|
||||
x: 0;
|
||||
width: parent.width * (root.muted ? 0 : root.level / 100);
|
||||
border-radius: 2px * Theme.s;
|
||||
background: Theme.muted;
|
||||
}
|
||||
}
|
||||
}
|
||||
Text {
|
||||
// Fixed, so the bar does not shift as the number changes, and wide
|
||||
// enough for "Muted".
|
||||
width: 4.2 * root.font-size;
|
||||
text: root.muted ? "Muted" : root.level;
|
||||
font-size: root.font-size;
|
||||
color: Theme.muted;
|
||||
vertical-alignment: center;
|
||||
}
|
||||
}
|
||||
|
||||
// The level after a volume change, faded out again by the app after a moment.
|
||||
component VolumeOverlay inherits Rectangle {
|
||||
in property <bool> shown;
|
||||
@@ -633,6 +676,8 @@ component NowBar inherits Rectangle {
|
||||
in property <float> progress;
|
||||
in property <string> time;
|
||||
in property <bool> paused;
|
||||
in property <int> volume;
|
||||
in property <bool> muted;
|
||||
|
||||
background: Theme.panel;
|
||||
|
||||
@@ -699,6 +744,12 @@ component NowBar inherits Rectangle {
|
||||
size: 15px * Theme.s;
|
||||
}
|
||||
}
|
||||
if root.has-track: Rectangle { width: 6px * Theme.s; }
|
||||
if root.has-track: VolumeLevel {
|
||||
level: root.volume;
|
||||
muted: root.muted;
|
||||
font-size: 15px * Theme.s;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -1017,35 +1068,10 @@ component NowPlayingView inherits Rectangle {
|
||||
}
|
||||
}
|
||||
HorizontalLayout {
|
||||
spacing: 10px * Theme.s;
|
||||
alignment: start;
|
||||
VerticalLayout {
|
||||
alignment: center;
|
||||
Speaker {
|
||||
muted: root.muted || root.volume == 0;
|
||||
tint: Theme.muted;
|
||||
size: 14px * Theme.s;
|
||||
}
|
||||
}
|
||||
VerticalLayout {
|
||||
alignment: center;
|
||||
Rectangle {
|
||||
width: 90px * Theme.s;
|
||||
height: 4px * Theme.s;
|
||||
border-radius: 2px * Theme.s;
|
||||
background: Theme.raised;
|
||||
Rectangle {
|
||||
x: 0;
|
||||
width: parent.width * (root.muted ? 0 : root.volume / 100);
|
||||
border-radius: 2px * Theme.s;
|
||||
background: Theme.muted;
|
||||
}
|
||||
}
|
||||
}
|
||||
Text {
|
||||
text: root.muted ? "Muted" : root.volume;
|
||||
font-size: 13px * Theme.s;
|
||||
color: Theme.muted;
|
||||
alignment: center;
|
||||
VolumeLevel {
|
||||
level: root.volume;
|
||||
muted: root.muted;
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -1374,6 +1400,8 @@ export component AppWindow inherits Window {
|
||||
progress: root.np-progress;
|
||||
time: root.np-position + " / " + root.np-duration;
|
||||
paused: root.np-paused;
|
||||
volume: root.volume;
|
||||
muted: root.muted;
|
||||
}
|
||||
|
||||
HintBar {
|
||||
|
||||
Reference in New Issue
Block a user