diff --git a/applet/contents/ui/ListItemBase.qml b/applet/contents/ui/ListItemBase.qml --- a/applet/contents/ui/ListItemBase.qml +++ b/applet/contents/ui/ListItemBase.qml @@ -77,12 +77,12 @@ onDragStarted: { draggedStream = PulseObject; - main.beginMoveStream(type == "sink-input" ? "sink" : "source"); + beginMoveStream(type == "sink-input" ? "sink" : "source"); } onDrop: { draggedStream = null; - main.endMoveStream(); + endMoveStream(); } MouseArea { diff --git a/applet/contents/ui/main.qml b/applet/contents/ui/main.qml --- a/applet/contents/ui/main.qml +++ b/applet/contents/ui/main.qml @@ -137,27 +137,6 @@ osd.showMicrophone(toMute? 0 : volumePercent(sourceModel.defaultSource.volume)); } - function beginMoveStream(type, stream) { - if (type == "sink") { - sourceView.visible = false; - sourceViewHeader.visible = false; - } else if (type == "source") { - sinkView.visible = false; - sinkViewHeader.visible = false; - } - - tabBar.currentTab = devicesTab; - } - - function endMoveStream() { - tabBar.currentTab = streamsTab; - - sourceView.visible = true; - sourceViewHeader.visible = true; - sinkView.visible = true; - sinkViewHeader.visible = true; - } - function playFeedback(sinkIndex) { if (!volumeFeedback) { return; @@ -276,6 +255,27 @@ Plasmoid.fullRepresentation: ColumnLayout { spacing: units.smallSpacing + function beginMoveStream(type, stream) { + if (type == "sink") { + sourceView.visible = false; + sourceViewHeader.visible = false; + } else if (type == "source") { + sinkView.visible = false; + sinkViewHeader.visible = false; + } + + tabBar.currentTab = devicesTab; + } + + function endMoveStream() { + tabBar.currentTab = streamsTab; + + sourceView.visible = true; + sourceViewHeader.visible = true; + sinkView.visible = true; + sinkViewHeader.visible = true; + } + RowLayout { spacing: units.smallSpacing Layout.fillWidth: true