From 48f8f00034be30553f0790893526b208b547e04a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jonah=20Br=C3=BCchert?= Date: Tue, 30 Jun 2020 14:31:49 +0200 Subject: [PATCH] Leave calculating the startup feedback color to plasma-nano --- containments/homescreen/colouraverage.cpp | 58 ------------------- containments/homescreen/colouraverage.h | 32 ---------- .../contents/ui/launcher/LauncherGrid.qml | 3 +- .../contents/ui/quicksettings/Delegate.qml | 6 +- 4 files changed, 3 insertions(+), 96 deletions(-) delete mode 100644 containments/homescreen/colouraverage.cpp delete mode 100644 containments/homescreen/colouraverage.h diff --git a/containments/homescreen/colouraverage.cpp b/containments/homescreen/colouraverage.cpp deleted file mode 100644 index 1e269ed0..00000000 --- a/containments/homescreen/colouraverage.cpp +++ /dev/null @@ -1,58 +0,0 @@ -/*************************************************************************** - * Copyright (C) 2019 Carson Black * - * * - * This program is free software; you can redistribute it and/or modify * - * it under the terms of the GNU General Public License as published by * - * the Free Software Foundation; either version 2 of the License, or * - * (at your option) any later version. * - * * - * This program is distributed in the hope that it will be useful, * - * but WITHOUT ANY WARRANTY; without even the implied warranty of * - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * - * GNU General Public License for more details. * - * * - * You should have received a copy of the GNU General Public License * - * along with this program; if not, write to the * - * Free Software Foundation, Inc., * - * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA . * - ***************************************************************************/ - -#include -#include -#include -#include - -#include "colouraverage.h" - -ColourAverage::ColourAverage(QObject *parent) : QObject(parent) -{ -} - -QColor ColourAverage::averageColour(const QImage &img) { - int r = 0; - int g = 0; - int b = 0; - int c = 0; - - for (int i = 0; i < img.width(); i++) { - for (int ii = 0; ii < img.height(); ii++) { - QRgb pix = img.pixel(i, ii); - if (pix == 0) - continue; - - c++; - r += qRed(pix); - g += qGreen(pix); - b += qBlue(pix); - } - } - r = r / c; - g = g / c; - b = b / c; - - QColor color = QColor::fromRgb(r,g,b); - - color.setHsv(color.hue(), color.saturation() / 4, color.value()); - - return color; -} diff --git a/containments/homescreen/colouraverage.h b/containments/homescreen/colouraverage.h deleted file mode 100644 index 0d15f53b..00000000 --- a/containments/homescreen/colouraverage.h +++ /dev/null @@ -1,32 +0,0 @@ -/*************************************************************************** - * Copyright (C) 2019 Carson Black * - * * - * This program is free software; you can redistribute it and/or modify * - * it under the terms of the GNU General Public License as published by * - * the Free Software Foundation; either version 2 of the License, or * - * (at your option) any later version. * - * * - * This program is distributed in the hope that it will be useful, * - * but WITHOUT ANY WARRANTY; without even the implied warranty of * - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * - * GNU General Public License for more details. * - * * - * You should have received a copy of the GNU General Public License * - * along with this program; if not, write to the * - * Free Software Foundation, Inc., * - * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA . * - ***************************************************************************/ -#pragma once - -#include -#include -#include - -class ColourAverage : public QObject -{ - Q_OBJECT - -public: - explicit ColourAverage(QObject *parent = nullptr); - Q_INVOKABLE QColor averageColour(const QImage &img); -}; diff --git a/containments/homescreen/package/contents/ui/launcher/LauncherGrid.qml b/containments/homescreen/package/contents/ui/launcher/LauncherGrid.qml index 4b751456..19f797ac 100644 --- a/containments/homescreen/package/contents/ui/launcher/LauncherGrid.qml +++ b/containments/homescreen/package/contents/ui/launcher/LauncherGrid.qml @@ -72,8 +72,7 @@ LauncherContainer { title, 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), - ColourAverage.averageColour(img.image)); + Math.min(delegate.iconItem.width, delegate.iconItem.height) }); } onParentFromLocationChanged: { diff --git a/containments/panel/package/contents/ui/quicksettings/Delegate.qml b/containments/panel/package/contents/ui/quicksettings/Delegate.qml index 339f5265..3800ff14 100644 --- a/containments/panel/package/contents/ui/quicksettings/Delegate.qml +++ b/containments/panel/package/contents/ui/quicksettings/Delegate.qml @@ -63,8 +63,7 @@ ColumnLayout { model.text, icon.Kirigami.ScenePosition.x + icon.width/2, icon.Kirigami.ScenePosition.y + icon.height/2, - Math.min(icon.width, icon.height), - theme.textColor); + Math.min(icon.width, icon.height)) plasmoid.nativeInterface.executeCommand(model.settingsCommand); root.closeRequested(); } @@ -110,8 +109,7 @@ ColumnLayout { model.text, icon.Kirigami.ScenePosition.x + icon.width/2, icon.Kirigami.ScenePosition.y + icon.height/2, - Math.min(icon.width, icon.height), - theme.textColor); + Math.min(icon.width, icon.height)) //plasmoid.nativeInterface.executeCommand(model.settingsCommand); closeRequested(); } else if (model.toggleFunction) {