diff --git a/components/mobileshell/qml/actiondrawer/quicksettings/QuickSettingsDrawer.qml b/components/mobileshell/qml/actiondrawer/quicksettings/QuickSettingsDrawer.qml index 7be95181..ce44157a 100644 --- a/components/mobileshell/qml/actiondrawer/quicksettings/QuickSettingsDrawer.qml +++ b/components/mobileshell/qml/actiondrawer/quicksettings/QuickSettingsDrawer.qml @@ -4,11 +4,9 @@ * SPDX-License-Identifier: LGPL-2.0-or-later */ -import QtQuick 2.15 -import QtQuick.Controls 2.15 as QQC2 -import QtQuick.Layouts 1.1 -import QtQuick.Window 2.2 -import Qt5Compat.GraphicalEffects +import QtQuick +import QtQuick.Controls as QQC2 +import QtQuick.Layouts import org.kde.kirigami 2.12 as Kirigami diff --git a/components/mobileshell/qml/actiondrawer/quicksettings/QuickSettingsPanel.qml b/components/mobileshell/qml/actiondrawer/quicksettings/QuickSettingsPanel.qml index ad0f779c..41ee8482 100644 --- a/components/mobileshell/qml/actiondrawer/quicksettings/QuickSettingsPanel.qml +++ b/components/mobileshell/qml/actiondrawer/quicksettings/QuickSettingsPanel.qml @@ -4,11 +4,9 @@ * SPDX-License-Identifier: LGPL-2.0-or-later */ -import QtQuick 2.15 -import QtQuick.Controls 2.15 as QQC2 -import QtQuick.Layouts 1.1 -import QtQuick.Window 2.2 -import Qt5Compat.GraphicalEffects +import QtQuick +import QtQuick.Controls as QQC2 +import QtQuick.Layouts import org.kde.kirigami 2.12 as Kirigami diff --git a/components/mobileshell/qml/components/StartupFeedback.qml b/components/mobileshell/qml/components/StartupFeedback.qml index 522b8ffc..4eb0719e 100644 --- a/components/mobileshell/qml/components/StartupFeedback.qml +++ b/components/mobileshell/qml/components/StartupFeedback.qml @@ -1,14 +1,14 @@ // SPDX-FileCopyrightText: 2015 Marco Martin -// SPDX-FileCopyrightText: 2021 Devin Lin +// SPDX-FileCopyrightText: 2021-2023 Devin Lin // SPDX-License-Identifier: LGPL-2.0-or-later -import QtQuick 2.12 -import QtQuick.Layouts 1.1 -import QtQuick.Window 2.2 +import QtQuick +import QtQuick.Effects +import QtQuick.Layouts +import QtQuick.Window import org.kde.plasma.core 2.0 as PlasmaCore -import Qt5Compat.GraphicalEffects -import org.kde.kirigami 2.13 as Kirigami +import org.kde.kirigami as Kirigami import org.kde.plasma.private.mobileshell.shellsettingsplugin as ShellSettings import org.kde.plasma.private.mobileshell.state as MobileShellState @@ -188,14 +188,13 @@ MouseArea { // use mousearea to ensure clicks don't go behind anchors.fill: parent colorGroup: PlasmaCore.Theme.ComplementaryColorGroup } - DropShadow { + + MultiEffect { anchors.fill: icon - horizontalOffset: 0 - verticalOffset: 0 - radius: 8.0 - samples: 17 - color: "#80000000" source: icon + shadowEnabled: true + blurMax: 16 + shadowColor: "#80000000" } } } diff --git a/components/mobileshell/qml/navigationpanel/NavigationPanel.qml b/components/mobileshell/qml/navigationpanel/NavigationPanel.qml index 5f3a8812..6464e765 100644 --- a/components/mobileshell/qml/navigationpanel/NavigationPanel.qml +++ b/components/mobileshell/qml/navigationpanel/NavigationPanel.qml @@ -5,10 +5,10 @@ * SPDX-License-Identifier: GPL-2.0-or-later */ -import QtQuick 2.4 -import QtQuick.Layouts 1.1 -import QtQuick.Window 2.2 -import Qt5Compat.GraphicalEffects +import QtQuick +import QtQuick.Layouts +import QtQuick.Window +import QtQuick.Effects import org.kde.taskmanager 0.1 as TaskManager import org.kde.plasma.core 2.0 as PlasmaCore @@ -31,17 +31,16 @@ Item { property NavigationPanelAction leftCornerAction property NavigationPanelAction rightCornerAction - - DropShadow { + + // drop shadow for icons + MultiEffect { anchors.fill: root visible: shadow - cached: true - horizontalOffset: 0 - verticalOffset: 1 - radius: 4.0 - samples: 17 - color: Qt.rgba(0,0,0,0.8) source: icons + blurMax: 16 + shadowEnabled: true + shadowVerticalOffset: 1 + shadowOpacity: 0.8 } Item { diff --git a/components/mobileshell/qml/statusbar/StatusBar.qml b/components/mobileshell/qml/statusbar/StatusBar.qml index 7b7666df..60f84840 100644 --- a/components/mobileshell/qml/statusbar/StatusBar.qml +++ b/components/mobileshell/qml/statusbar/StatusBar.qml @@ -6,11 +6,11 @@ */ -import QtQuick 2.12 -import QtQuick.Controls 2.12 as Controls -import QtQuick.Layouts 1.3 -import QtQml.Models 2.12 -import Qt5Compat.GraphicalEffects +import QtQuick +import QtQuick.Layouts +import QtQuick.Effects +import QtQuick.Controls as Controls +import QtQml.Models import org.kde.plasma.core 2.0 as PlasmaCore import org.kde.plasma.plasma5support 2.0 as P5Support @@ -85,16 +85,15 @@ Item { } } - DropShadow { + // drop shadow for icons + MultiEffect { anchors.fill: icons visible: showDropShadow - cached: true - horizontalOffset: 0 - verticalOffset: 1 - radius: 6.0 - samples: 17 - color: Qt.rgba(0,0,0,0.6) source: icons + blurMax: 16 + shadowEnabled: true + shadowVerticalOffset: 1 + shadowOpacity: 0.8 } // screen top panel diff --git a/components/mobileshell/qml/volumeosd/AudioApplet.qml b/components/mobileshell/qml/volumeosd/AudioApplet.qml index b02fe762..ce234892 100644 --- a/components/mobileshell/qml/volumeosd/AudioApplet.qml +++ b/components/mobileshell/qml/volumeosd/AudioApplet.qml @@ -6,10 +6,9 @@ */ import QtQuick -import QtQuick.Controls as Controls import QtQuick.Layouts import QtQuick.Window -import Qt5Compat.GraphicalEffects +import QtQuick.Controls as Controls import org.kde.plasma.core as PlasmaCore import org.kde.plasma.components 3.0 as PlasmaComponents diff --git a/components/mobileshell/qml/volumeosd/PopupCard.qml b/components/mobileshell/qml/volumeosd/PopupCard.qml index 551cba5f..7208718f 100644 --- a/components/mobileshell/qml/volumeosd/PopupCard.qml +++ b/components/mobileshell/qml/volumeosd/PopupCard.qml @@ -4,10 +4,10 @@ * SPDX-License-Identifier: GPL-2.0-or-later */ -import QtQuick 2.15 -import QtQuick.Controls 2.15 as Controls -import QtQuick.Layouts 1.1 -import QtQuick.Window 2.2 +import QtQuick +import QtQuick.Controls as Controls +import QtQuick.Layouts +import QtQuick.Window import org.kde.plasma.core 2.1 as PlasmaCore import org.kde.plasma.components 3.0 as PlasmaComponents diff --git a/components/mobileshell/qml/volumeosd/VolumeOSD.qml b/components/mobileshell/qml/volumeosd/VolumeOSD.qml index a8f4daf8..b0589b65 100644 --- a/components/mobileshell/qml/volumeosd/VolumeOSD.qml +++ b/components/mobileshell/qml/volumeosd/VolumeOSD.qml @@ -10,7 +10,6 @@ import QtQuick import QtQuick.Controls as Controls import QtQuick.Layouts import QtQuick.Window -import Qt5Compat.GraphicalEffects import org.kde.plasma.core 2.0 as PlasmaCore import org.kde.plasma.extras 2.0 as PlasmaExtra diff --git a/components/mobileshell/qml/widgets/krunner/KRunnerWidget.qml b/components/mobileshell/qml/widgets/krunner/KRunnerWidget.qml index d260f2c0..dd1db6d7 100644 --- a/components/mobileshell/qml/widgets/krunner/KRunnerWidget.qml +++ b/components/mobileshell/qml/widgets/krunner/KRunnerWidget.qml @@ -6,16 +6,16 @@ * SPDX-License-Identifier: LGPL-2.0-or-later */ -import QtQuick 2.15 -import QtQuick.Controls 2.15 as Controls -import QtQuick.Layouts 1.15 -import Qt5Compat.GraphicalEffects +import QtQuick +import QtQuick.Effects +import QtQuick.Controls as Controls +import QtQuick.Layouts import org.kde.plasma.core 2.0 as PlasmaCore import org.kde.plasma.components 3.0 as PlasmaComponents import org.kde.plasma.extras 2.0 as PlasmaExtras -import org.kde.milou 0.1 as Milou +import org.kde.milou as Milou import org.kde.kirigami 2.19 as Kirigami import "../../components" as Components @@ -150,16 +150,17 @@ Item { background: Item { // shadow for search window - RectangularGlow { - anchors.topMargin: 1 + MultiEffect { anchors.fill: parent - cached: true - glowRadius: 4 - spread: 0.2 - color: Qt.rgba(0, 0, 0, 0.15) + source: rectBackground + blurMax: 16 + shadowEnabled: true + shadowVerticalOffset: 1 + shadowOpacity: 0.15 } Rectangle { + id: rectBackground anchors.fill: parent color: PlasmaCore.Theme.backgroundColor radius: PlasmaCore.Units.smallSpacing