Skip to content

Commit 7fa275f

Browse files
Modify to work consitently on multiple screen sizes
1 parent b687ae2 commit 7fa275f

File tree

3 files changed

+13
-2
lines changed

3 files changed

+13
-2
lines changed

web/src/components/VolumeZones/VolumeZones.jsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ const VolumeZones = ({ sourceId, open, zones, groups, groupsLeft, setZonesModalO
3434

3535
if (open) {
3636
return (
37-
<div className={`volume-sliders-container ${(open && !noZones) && "add-padding"}`}>
37+
<div className={`volume-sliders-container ${(!noZones) && "add-padding"}`}>
3838
{groupVolumeSliders}
3939
{zoneVolumeSliders}
4040
<RectangularButton large label="+" onClick={() => {setZonesModalOpen(true);}} />

web/src/pages/Player/Player.jsx

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -64,6 +64,12 @@ const Player = () => {
6464
// This is a bootleg XOR statement, only works if there is exactly one zone or exactly one group, no more than that and not both
6565
const alone = ((usedGroups.length == 1) || (zonesLeft.length == 1)) && !((usedGroups.length > 0) && (zonesLeft.length > 0));
6666

67+
React.useEffect(() => {
68+
if(zonesLeft.length == 0 && usedGroups.length == 0){
69+
setExpanded(false);
70+
}
71+
}, [zonesLeft.length, usedGroups.length]); // Automatically unexpand when no zones or groups are connected
72+
6773
selectActiveSource();
6874

6975
function DropdownArrow() {
@@ -136,7 +142,7 @@ const Player = () => {
136142
</IconButton>
137143
</div>
138144
)}
139-
<div className={`player-volume-body ${(expanded) && "expanded-volume-body pill-scrollbar"}`}>
145+
<div className={`player-volume-body ${(expanded) && "expanded-volume-body pill-scrollbar scrollable"}`}>
140146
<VolumeZones setZonesModalOpen={setZonesModalOpen} open={(expanded)} sourceId={selectedSourceId} zones={zonesLeft} groups={usedGroups} groupsLeft={groupsLeft} />
141147
</div>
142148
</Card>

web/src/pages/Player/Player.scss

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -84,6 +84,11 @@
8484
flex-direction: column;
8585
@media (general.$is-portrait) {
8686
max-height: calc(85vh - 120px);
87+
}
88+
}
89+
90+
.scrollable{
91+
@media (general.$is-portrait) {
8792
overflow-y: auto;
8893
}
8994
}

0 commit comments

Comments
 (0)