X-Git-Url: https://cloud.milkyroute.net/gitweb/dolphin.git/blobdiff_plain/3b7c05b385dc56fbc0b9ffdd332f8d30e7624d0c..78cffd2979a6ed87e044fcb024cf4fdfc5c7cb3d:/src/selectionmode/backgroundcolorhelper.cpp diff --git a/src/selectionmode/backgroundcolorhelper.cpp b/src/selectionmode/backgroundcolorhelper.cpp index 8a7d69758..fc5403152 100644 --- a/src/selectionmode/backgroundcolorhelper.cpp +++ b/src/selectionmode/backgroundcolorhelper.cpp @@ -1,6 +1,6 @@ /* This file is part of the KDE project - SPDX-FileCopyrightText: 2022 Felix Ernst + SPDX-FileCopyrightText: 2022 Felix Ernst SPDX-License-Identifier: LGPL-2.1-only OR LGPL-3.0-only OR LicenseRef-KDE-Accepted-LGPL */ @@ -14,6 +14,8 @@ #include #include +using namespace SelectionMode; + BackgroundColorHelper *BackgroundColorHelper::instance() { if (!s_instance) { @@ -52,9 +54,11 @@ void BackgroundColorHelper::slotPaletteChanged() { updateBackgroundColor(); for (auto i = m_colorControlledWidgets.begin(); i != m_colorControlledWidgets.end(); ++i) { - if (!*i) { + while (!*i) { i = m_colorControlledWidgets.erase(i); - continue; + if (i == m_colorControlledWidgets.end()) { + break; + } } setBackgroundColorForWidget(*i, m_backgroundColor); } @@ -81,7 +85,8 @@ void BackgroundColorHelper::updateBackgroundColor() } m_backgroundColor = QColor::fromHsv(newHue, - // Saturation should be closer to the active color because otherwise the selection mode color might overpower it. + // Saturation should be closer to the saturation of the active color + // because otherwise the selection mode color might overpower it. .7 * activeBackgroundColor.saturation() + .3 * positiveBackgroundColor.saturation(), (activeBackgroundColor.value() + positiveBackgroundColor.value()) / 2, (activeBackgroundColor.alpha() + positiveBackgroundColor.alpha()) / 2);