Hello community, here is the log from the commit of package plasma5-pa for openSUSE:Factory checked in at 2018-01-26 13:36:29 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/plasma5-pa (Old) and /work/SRC/openSUSE:Factory/.plasma5-pa.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "plasma5-pa" Fri Jan 26 13:36:29 2018 rev:43 rq:569732 version:5.11.95 Changes: -------- --- /work/SRC/openSUSE:Factory/plasma5-pa/plasma5-pa.changes 2018-01-22 16:06:38.627265859 +0100 +++ /work/SRC/openSUSE:Factory/.plasma5-pa.new/plasma5-pa.changes 2018-01-26 13:36:30.609671930 +0100 @@ -1,0 +2,6 @@ +Thu Jan 25 18:53:05 UTC 2018 - [email protected] + +- Add patch to fix channel drag-and-drop: + * 0001-Fix-moving-streams-by-drag-and-drop.patch + +------------------------------------------------------------------- New: ---- 0001-Fix-moving-streams-by-drag-and-drop.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ plasma5-pa.spec ++++++ --- /var/tmp/diff_new_pack.tUunDA/_old 2018-01-26 13:36:31.413634379 +0100 +++ /var/tmp/diff_new_pack.tUunDA/_new 2018-01-26 13:36:31.413634379 +0100 @@ -25,6 +25,8 @@ Group: System/GUI/KDE Url: http://www.kde.org Source: http://download.kde.org/unstable/plasma/%{version}/plasma-pa-%{version}.tar.xz +# PATCH-FIX-UPSTREAM +Patch1: 0001-Fix-moving-streams-by-drag-and-drop.patch BuildRequires: extra-cmake-modules >= 0.0.14 BuildRequires: kf5-filesystem BuildRequires: libcanberra-devel @@ -55,6 +57,7 @@ %lang_package %prep %setup -q -n plasma-pa-%{version} +%patch1 -p1 %build %cmake_kf5 -d build -- -DCMAKE_INSTALL_LOCALEDIR=%{_kf5_localedir} ++++++ 0001-Fix-moving-streams-by-drag-and-drop.patch ++++++ >From 12c5c46a91212e6c139e5e73c16664dbc42873f9 Mon Sep 17 00:00:00 2001 From: Kai Uwe Broulik <[email protected]> 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
