diff -Nru elisa-player-21.08.1/debian/changelog elisa-player-21.08.1/debian/changelog --- elisa-player-21.08.1/debian/changelog 2021-09-03 05:49:21.000000000 +0000 +++ elisa-player-21.08.1/debian/changelog 2021-09-20 14:21:39.000000000 +0000 @@ -1,3 +1,11 @@ +elisa-player (21.08.1-1ubuntu1) impish; urgency=medium + + * Add upstream bugfix patches: + - d/p/upstream_fix-toolbutton-icon-colours.patch + - d/p/upstream_dont-disable-forward-backward-buttons-when-paused.patch + + -- Rik Mills Mon, 20 Sep 2021 15:21:39 +0100 + elisa-player (21.08.1-1) unstable; urgency=medium [ Norbert Preining ] diff -Nru elisa-player-21.08.1/debian/patches/series elisa-player-21.08.1/debian/patches/series --- elisa-player-21.08.1/debian/patches/series 1970-01-01 00:00:00.000000000 +0000 +++ elisa-player-21.08.1/debian/patches/series 2021-09-20 14:21:39.000000000 +0000 @@ -0,0 +1,2 @@ +upstream_fix-toolbutton-icon-colours.patch +upstream_dont-disable-forward-backward-buttons-when-paused.patch diff -Nru elisa-player-21.08.1/debian/patches/upstream_dont-disable-forward-backward-buttons-when-paused.patch elisa-player-21.08.1/debian/patches/upstream_dont-disable-forward-backward-buttons-when-paused.patch --- elisa-player-21.08.1/debian/patches/upstream_dont-disable-forward-backward-buttons-when-paused.patch 1970-01-01 00:00:00.000000000 +0000 +++ elisa-player-21.08.1/debian/patches/upstream_dont-disable-forward-backward-buttons-when-paused.patch 2021-09-20 14:21:39.000000000 +0000 @@ -0,0 +1,82 @@ +From 62d3fd14db7bce19cc738ef9393008ea3b753457 Mon Sep 17 00:00:00 2001 +From: Nate Graham +Date: Wed, 8 Sep 2021 15:28:02 -0600 +Subject: [PATCH] Don't unnecessarily disable back and forward buttons when + paused + +You might still want to move backwards or forward when the player is +paused. + +BUG: 442137 +FIXED-IN: 21.08.2 +--- + autotests/managemediaplayercontroltest.cpp | 14 +++++++------- + src/managemediaplayercontrol.cpp | 4 ++-- + 2 files changed, 9 insertions(+), 9 deletions(-) + +diff --git a/autotests/managemediaplayercontroltest.cpp b/autotests/managemediaplayercontroltest.cpp +index 0ca2b7d0..84be1d18 100644 +--- a/autotests/managemediaplayercontroltest.cpp ++++ b/autotests/managemediaplayercontroltest.cpp +@@ -107,11 +107,11 @@ void ManageMediaPlayerControlTest::testTracksCase() + QCOMPARE(previousTrackChangedSpy.count(), 1); + QCOMPARE(currentTrackChangedSpy.count(), 1); + QCOMPARE(nextTrackChangedSpy.count(), 0); +- QCOMPARE(skipBackwardControlEnabledChangedSpy.count(), 0); ++ QCOMPARE(skipBackwardControlEnabledChangedSpy.count(), 1); + QCOMPARE(playControlEnabledChangedSpy.count(), 1); + QCOMPARE(skipForwardControlEnabledChangedSpy.count(), 0); + QVERIFY(myControl.playControlEnabled()); +- QVERIFY(!myControl.skipBackwardControlEnabled()); ++ QVERIFY(myControl.skipBackwardControlEnabled()); + QVERIFY(!myControl.skipForwardControlEnabled()); + + myControl.playerPlaying(); +@@ -132,12 +132,12 @@ void ManageMediaPlayerControlTest::testTracksCase() + QCOMPARE(previousTrackChangedSpy.count(), 1); + QCOMPARE(currentTrackChangedSpy.count(), 1); + QCOMPARE(nextTrackChangedSpy.count(), 1); +- QCOMPARE(skipBackwardControlEnabledChangedSpy.count(), 2); ++ QCOMPARE(skipBackwardControlEnabledChangedSpy.count(), 1); + QCOMPARE(playControlEnabledChangedSpy.count(), 1); +- QCOMPARE(skipForwardControlEnabledChangedSpy.count(), 0); ++ QCOMPARE(skipForwardControlEnabledChangedSpy.count(), 1); + QVERIFY(myControl.playControlEnabled()); +- QVERIFY(!myControl.skipBackwardControlEnabled()); +- QVERIFY(!myControl.skipForwardControlEnabled()); ++ QVERIFY(myControl.skipBackwardControlEnabled()); ++ QVERIFY(myControl.skipForwardControlEnabled()); + + myControl.playerPlaying(); + +@@ -145,7 +145,7 @@ void ManageMediaPlayerControlTest::testTracksCase() + QCOMPARE(currentTrackChangedSpy.count(), 1); + QCOMPARE(nextTrackChangedSpy.count(), 1); + QCOMPARE(nextTrackChangedSpy.count(), 1); +- QCOMPARE(skipBackwardControlEnabledChangedSpy.count(), 3); ++ QCOMPARE(skipBackwardControlEnabledChangedSpy.count(), 1); + QCOMPARE(playControlEnabledChangedSpy.count(), 1); + QCOMPARE(skipForwardControlEnabledChangedSpy.count(), 1); + QVERIFY(myControl.playControlEnabled()); +diff --git a/src/managemediaplayercontrol.cpp b/src/managemediaplayercontrol.cpp +index 4aa94062..9497d073 100644 +--- a/src/managemediaplayercontrol.cpp ++++ b/src/managemediaplayercontrol.cpp +@@ -19,12 +19,12 @@ bool ManageMediaPlayerControl::playControlEnabled() const + + bool ManageMediaPlayerControl::skipBackwardControlEnabled() const + { +- return (mPreviousTrack.isValid() && mIsInPlayingState); ++ return (mPreviousTrack.isValid()); + } + + bool ManageMediaPlayerControl::skipForwardControlEnabled() const + { +- return (mNextTrack.isValid() && mIsInPlayingState); ++ return (mNextTrack.isValid()); + } + + bool ManageMediaPlayerControl::musicPlaying() const +-- +GitLab + diff -Nru elisa-player-21.08.1/debian/patches/upstream_fix-toolbutton-icon-colours.patch elisa-player-21.08.1/debian/patches/upstream_fix-toolbutton-icon-colours.patch --- elisa-player-21.08.1/debian/patches/upstream_fix-toolbutton-icon-colours.patch 1970-01-01 00:00:00.000000000 +0000 +++ elisa-player-21.08.1/debian/patches/upstream_fix-toolbutton-icon-colours.patch 2021-09-20 14:21:39.000000000 +0000 @@ -0,0 +1,119 @@ +From 27b47899e4df13ef7b9f7cf52d41bd01a19040e1 Mon Sep 17 00:00:00 2001 +From: Devin Lin +Date: Tue, 14 Sep 2021 20:02:44 -0400 +Subject: [PATCH] Fix ToolButton icon colours not being white + +--- + src/qml/NavigationActionBar.qml | 1 + + src/qml/mobile/MobileMinimizedPlayerControl.qml | 6 ++++++ + src/qml/mobile/MobileTrackPlayer.qml | 15 ++++++++++----- + src/qml/mobile/MobileVolumeButton.qml | 3 +++ + 4 files changed, 20 insertions(+), 5 deletions(-) + +diff --git a/src/qml/NavigationActionBar.qml b/src/qml/NavigationActionBar.qml +index 3e3257ca..fb79160c 100644 +--- a/src/qml/NavigationActionBar.qml ++++ b/src/qml/NavigationActionBar.qml +@@ -85,6 +85,7 @@ Item { + implicitWidth: Kirigami.Units.iconSizes.small + implicitHeight: Kirigami.Units.iconSizes.small + source: 'arrow-down' ++ isMask: true + } + } + } +diff --git a/src/qml/mobile/MobileMinimizedPlayerControl.qml b/src/qml/mobile/MobileMinimizedPlayerControl.qml +index f6484667..41baf71a 100644 +--- a/src/qml/mobile/MobileMinimizedPlayerControl.qml ++++ b/src/qml/mobile/MobileMinimizedPlayerControl.qml +@@ -231,6 +231,8 @@ BasePlayerControl { + icon.width: Kirigami.Units.gridUnit + icon.height: Kirigami.Units.gridUnit + icon.color: "white" ++ Kirigami.Theme.colorSet: Kirigami.Theme.Complementary ++ Kirigami.Theme.inherit: false + } + + FlatButtonWithToolTip { +@@ -245,6 +247,8 @@ BasePlayerControl { + icon.width: Kirigami.Units.gridUnit + icon.height: Kirigami.Units.gridUnit + icon.color: "white" ++ Kirigami.Theme.colorSet: Kirigami.Theme.Complementary ++ Kirigami.Theme.inherit: false + } + + FlatButtonWithToolTip { +@@ -259,6 +263,8 @@ BasePlayerControl { + icon.width: Kirigami.Units.gridUnit + icon.height: Kirigami.Units.gridUnit + icon.color: "white" ++ Kirigami.Theme.colorSet: Kirigami.Theme.Complementary ++ Kirigami.Theme.inherit: false + } + + Item { implicitWidth: Math.floor(Kirigami.Units.smallSpacing / 2) } +diff --git a/src/qml/mobile/MobileTrackPlayer.qml b/src/qml/mobile/MobileTrackPlayer.qml +index 5aba03df..c384c916 100644 +--- a/src/qml/mobile/MobileTrackPlayer.qml ++++ b/src/qml/mobile/MobileTrackPlayer.qml +@@ -34,11 +34,6 @@ BasePlayerControl { + property color sliderRemainingColor: "grey" + property color sliderHandleColor: "white" + +- SystemPalette { +- id: myPalette +- colorGroup: SystemPalette.Active +- } +- + ColumnLayout { + anchors.fill: parent + spacing: Kirigami.Units.largeSpacing +@@ -54,6 +49,8 @@ BasePlayerControl { + text: i18nc("minimize player", "Minimize Player") + icon.name: "arrow-down" + icon.color: "white" ++ Kirigami.Theme.colorSet: Kirigami.Theme.Complementary ++ Kirigami.Theme.inherit: false + onClicked: toClose.restart() + } + +@@ -193,6 +190,10 @@ BasePlayerControl { + RowLayout { + Layout.preferredHeight: Kirigami.Units.gridUnit * 3 + ++ // ensure white icons ++ Kirigami.Theme.colorSet: Kirigami.Theme.Complementary ++ Kirigami.Theme.inherit: false ++ + FlatButtonWithToolTip { + id: infoButton + Layout.maximumHeight: parent.height +@@ -296,6 +297,10 @@ BasePlayerControl { + Layout.alignment: Qt.AlignHCenter + Layout.preferredHeight: Math.floor(Kirigami.Units.gridUnit * 2.5) + ++ // ensure white icons ++ Kirigami.Theme.colorSet: Kirigami.Theme.Complementary ++ Kirigami.Theme.inherit: false ++ + // volume button + MobileVolumeButton { + id: volumeButton +diff --git a/src/qml/mobile/MobileVolumeButton.qml b/src/qml/mobile/MobileVolumeButton.qml +index 7f4c5129..d645de45 100644 +--- a/src/qml/mobile/MobileVolumeButton.qml ++++ b/src/qml/mobile/MobileVolumeButton.qml +@@ -27,6 +27,9 @@ FlatButtonWithToolTip { + text: i18nc("change player volume", "Change Volume") + icon.name: volumeButton.muted || volumeButton.slider.visualPosition == 0 ? "player-volume-muted" : "player-volume" + icon.color: "white" ++ Kirigami.Theme.colorSet: Kirigami.Theme.Complementary ++ Kirigami.Theme.inherit: false ++ + onClicked: { + if (volumeSliderPopup.visible) { + volumeSliderPopup.close(); +-- +GitLab +