From f3ab3c0a567d06073ecea90ea62e390cb66a0742 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jonah=20Br=C3=BCchert?= Date: Mon, 25 May 2020 19:07:38 +0200 Subject: [PATCH] Adapt to plasma nano API change --- .../package/contents/ui/launcher/LauncherGrid.qml | 4 ++-- .../panel/package/contents/ui/quicksettings/Delegate.qml | 8 ++++---- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/containments/homescreen/package/contents/ui/launcher/LauncherGrid.qml b/containments/homescreen/package/contents/ui/launcher/LauncherGrid.qml index 69787b58..4b751456 100644 --- a/containments/homescreen/package/contents/ui/launcher/LauncherGrid.qml +++ b/containments/homescreen/package/contents/ui/launcher/LauncherGrid.qml @@ -70,10 +70,10 @@ LauncherContainer { NanoShell.StartupFeedback.open( icon, title, - ColourAverage.averageColour(img.image), delegate.iconItem.Kirigami.ScenePosition.x + delegate.iconItem.width/2, delegate.iconItem.Kirigami.ScenePosition.y + delegate.iconItem.height/2, - Math.min(delegate.iconItem.width, delegate.iconItem.height)); + Math.min(delegate.iconItem.width, delegate.iconItem.height), + ColourAverage.averageColour(img.image)); }); } onParentFromLocationChanged: { diff --git a/containments/panel/package/contents/ui/quicksettings/Delegate.qml b/containments/panel/package/contents/ui/quicksettings/Delegate.qml index af218236..339f5265 100644 --- a/containments/panel/package/contents/ui/quicksettings/Delegate.qml +++ b/containments/panel/package/contents/ui/quicksettings/Delegate.qml @@ -61,10 +61,10 @@ ColumnLayout { NanoShell.StartupFeedback.open( model.icon, model.text, - theme.textColor, icon.Kirigami.ScenePosition.x + icon.width/2, icon.Kirigami.ScenePosition.y + icon.height/2, - Math.min(icon.width, icon.height)); + Math.min(icon.width, icon.height), + theme.textColor); plasmoid.nativeInterface.executeCommand(model.settingsCommand); root.closeRequested(); } @@ -108,10 +108,10 @@ ColumnLayout { NanoShell.StartupFeedback.open( model.icon, model.text, - theme.textColor, icon.Kirigami.ScenePosition.x + icon.width/2, icon.Kirigami.ScenePosition.y + icon.height/2, - Math.min(icon.width, icon.height)); + Math.min(icon.width, icon.height), + theme.textColor); //plasmoid.nativeInterface.executeCommand(model.settingsCommand); closeRequested(); } else if (model.toggleFunction) {