File 0001-Fix-moving-streams-by-drag-and-drop.patch of Package plasma5-pa

Overview Repositories Revisions Requests Users Attributes Meta

File 0001-Fix-moving-streams-by-drag-and-drop.patch of Package plasma5-pa (Revision b82db9f9b0fd09d4a10abd451ef97ec2)

Currently displaying revision b82db9f9b0fd09d4a10abd451ef97ec2 , Show latest

From 12c5c46a91212e6c139e5e73c16664dbc42873f9 Mon Sep 17 00:00:00 2001
From: Kai Uwe Broulik <kde@privat.broulik.de>
Date: Thu, 25 Jan 2018 10:23:45 +0100
Subject: [PATCH] Fix moving streams by drag and drop

This broke when I moved the contents into compactRepresentation as the main could no longer access those items by ID.

BUG: 389402
FIXED-IN: 5.12.0

Differential Revision: https://phabricator.kde.org/D10093
---
 applet/contents/ui/ListItemBase.qml |  4 ++--
 applet/contents/ui/main.qml         | 42 ++++++++++++++++++-------------------
 2 files changed, 23 insertions(+), 23 deletions(-)

diff --git a/applet/contents/ui/ListItemBase.qml b/applet/contents/ui/ListItemBase.qml
index 4c2c23f..63da424 100644
--- a/applet/contents/ui/ListItemBase.qml
+++ b/applet/contents/ui/ListItemBase.qml
@@ -77,12 +77,12 @@ PlasmaComponents.ListItem {
 
                     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
index a9c3207..ef218ad 100644
--- a/applet/contents/ui/main.qml
+++ b/applet/contents/ui/main.qml
@@ -137,27 +137,6 @@ Item {
         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 @@ Item {
     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
-- 
2.16.0

Places

File 0001-Fix-moving-streams-by-drag-and-drop.patch of Package plasma5-pa (Revision b82db9f9b0fd09d4a10abd451ef97ec2)

Places