mirror of
https://invent.kde.org/marcoa/shift-shell.git
synced 2026-08-01 17:24:48 +00:00
components: Port to MultiEffect
This commit is contained in:
parent
23848618c4
commit
dffa0a9581
9 changed files with 56 additions and 64 deletions
|
|
@ -4,11 +4,9 @@
|
||||||
* SPDX-License-Identifier: LGPL-2.0-or-later
|
* SPDX-License-Identifier: LGPL-2.0-or-later
|
||||||
*/
|
*/
|
||||||
|
|
||||||
import QtQuick 2.15
|
import QtQuick
|
||||||
import QtQuick.Controls 2.15 as QQC2
|
import QtQuick.Controls as QQC2
|
||||||
import QtQuick.Layouts 1.1
|
import QtQuick.Layouts
|
||||||
import QtQuick.Window 2.2
|
|
||||||
import Qt5Compat.GraphicalEffects
|
|
||||||
|
|
||||||
import org.kde.kirigami 2.12 as Kirigami
|
import org.kde.kirigami 2.12 as Kirigami
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -4,11 +4,9 @@
|
||||||
* SPDX-License-Identifier: LGPL-2.0-or-later
|
* SPDX-License-Identifier: LGPL-2.0-or-later
|
||||||
*/
|
*/
|
||||||
|
|
||||||
import QtQuick 2.15
|
import QtQuick
|
||||||
import QtQuick.Controls 2.15 as QQC2
|
import QtQuick.Controls as QQC2
|
||||||
import QtQuick.Layouts 1.1
|
import QtQuick.Layouts
|
||||||
import QtQuick.Window 2.2
|
|
||||||
import Qt5Compat.GraphicalEffects
|
|
||||||
|
|
||||||
import org.kde.kirigami 2.12 as Kirigami
|
import org.kde.kirigami 2.12 as Kirigami
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -1,14 +1,14 @@
|
||||||
// SPDX-FileCopyrightText: 2015 Marco Martin <notmart@gmail.com>
|
// SPDX-FileCopyrightText: 2015 Marco Martin <notmart@gmail.com>
|
||||||
// SPDX-FileCopyrightText: 2021 Devin Lin <devin@kde.org>
|
// SPDX-FileCopyrightText: 2021-2023 Devin Lin <devin@kde.org>
|
||||||
// SPDX-License-Identifier: LGPL-2.0-or-later
|
// SPDX-License-Identifier: LGPL-2.0-or-later
|
||||||
|
|
||||||
import QtQuick 2.12
|
import QtQuick
|
||||||
import QtQuick.Layouts 1.1
|
import QtQuick.Effects
|
||||||
import QtQuick.Window 2.2
|
import QtQuick.Layouts
|
||||||
|
import QtQuick.Window
|
||||||
import org.kde.plasma.core 2.0 as PlasmaCore
|
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.shellsettingsplugin as ShellSettings
|
||||||
import org.kde.plasma.private.mobileshell.state as MobileShellState
|
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
|
anchors.fill: parent
|
||||||
colorGroup: PlasmaCore.Theme.ComplementaryColorGroup
|
colorGroup: PlasmaCore.Theme.ComplementaryColorGroup
|
||||||
}
|
}
|
||||||
DropShadow {
|
|
||||||
|
MultiEffect {
|
||||||
anchors.fill: icon
|
anchors.fill: icon
|
||||||
horizontalOffset: 0
|
|
||||||
verticalOffset: 0
|
|
||||||
radius: 8.0
|
|
||||||
samples: 17
|
|
||||||
color: "#80000000"
|
|
||||||
source: icon
|
source: icon
|
||||||
|
shadowEnabled: true
|
||||||
|
blurMax: 16
|
||||||
|
shadowColor: "#80000000"
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -5,10 +5,10 @@
|
||||||
* SPDX-License-Identifier: GPL-2.0-or-later
|
* SPDX-License-Identifier: GPL-2.0-or-later
|
||||||
*/
|
*/
|
||||||
|
|
||||||
import QtQuick 2.4
|
import QtQuick
|
||||||
import QtQuick.Layouts 1.1
|
import QtQuick.Layouts
|
||||||
import QtQuick.Window 2.2
|
import QtQuick.Window
|
||||||
import Qt5Compat.GraphicalEffects
|
import QtQuick.Effects
|
||||||
|
|
||||||
import org.kde.taskmanager 0.1 as TaskManager
|
import org.kde.taskmanager 0.1 as TaskManager
|
||||||
import org.kde.plasma.core 2.0 as PlasmaCore
|
import org.kde.plasma.core 2.0 as PlasmaCore
|
||||||
|
|
@ -31,17 +31,16 @@ Item {
|
||||||
|
|
||||||
property NavigationPanelAction leftCornerAction
|
property NavigationPanelAction leftCornerAction
|
||||||
property NavigationPanelAction rightCornerAction
|
property NavigationPanelAction rightCornerAction
|
||||||
|
|
||||||
DropShadow {
|
// drop shadow for icons
|
||||||
|
MultiEffect {
|
||||||
anchors.fill: root
|
anchors.fill: root
|
||||||
visible: shadow
|
visible: shadow
|
||||||
cached: true
|
|
||||||
horizontalOffset: 0
|
|
||||||
verticalOffset: 1
|
|
||||||
radius: 4.0
|
|
||||||
samples: 17
|
|
||||||
color: Qt.rgba(0,0,0,0.8)
|
|
||||||
source: icons
|
source: icons
|
||||||
|
blurMax: 16
|
||||||
|
shadowEnabled: true
|
||||||
|
shadowVerticalOffset: 1
|
||||||
|
shadowOpacity: 0.8
|
||||||
}
|
}
|
||||||
|
|
||||||
Item {
|
Item {
|
||||||
|
|
|
||||||
|
|
@ -6,11 +6,11 @@
|
||||||
*/
|
*/
|
||||||
|
|
||||||
|
|
||||||
import QtQuick 2.12
|
import QtQuick
|
||||||
import QtQuick.Controls 2.12 as Controls
|
import QtQuick.Layouts
|
||||||
import QtQuick.Layouts 1.3
|
import QtQuick.Effects
|
||||||
import QtQml.Models 2.12
|
import QtQuick.Controls as Controls
|
||||||
import Qt5Compat.GraphicalEffects
|
import QtQml.Models
|
||||||
|
|
||||||
import org.kde.plasma.core 2.0 as PlasmaCore
|
import org.kde.plasma.core 2.0 as PlasmaCore
|
||||||
import org.kde.plasma.plasma5support 2.0 as P5Support
|
import org.kde.plasma.plasma5support 2.0 as P5Support
|
||||||
|
|
@ -85,16 +85,15 @@ Item {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
DropShadow {
|
// drop shadow for icons
|
||||||
|
MultiEffect {
|
||||||
anchors.fill: icons
|
anchors.fill: icons
|
||||||
visible: showDropShadow
|
visible: showDropShadow
|
||||||
cached: true
|
|
||||||
horizontalOffset: 0
|
|
||||||
verticalOffset: 1
|
|
||||||
radius: 6.0
|
|
||||||
samples: 17
|
|
||||||
color: Qt.rgba(0,0,0,0.6)
|
|
||||||
source: icons
|
source: icons
|
||||||
|
blurMax: 16
|
||||||
|
shadowEnabled: true
|
||||||
|
shadowVerticalOffset: 1
|
||||||
|
shadowOpacity: 0.8
|
||||||
}
|
}
|
||||||
|
|
||||||
// screen top panel
|
// screen top panel
|
||||||
|
|
|
||||||
|
|
@ -6,10 +6,9 @@
|
||||||
*/
|
*/
|
||||||
|
|
||||||
import QtQuick
|
import QtQuick
|
||||||
import QtQuick.Controls as Controls
|
|
||||||
import QtQuick.Layouts
|
import QtQuick.Layouts
|
||||||
import QtQuick.Window
|
import QtQuick.Window
|
||||||
import Qt5Compat.GraphicalEffects
|
import QtQuick.Controls as Controls
|
||||||
|
|
||||||
import org.kde.plasma.core as PlasmaCore
|
import org.kde.plasma.core as PlasmaCore
|
||||||
import org.kde.plasma.components 3.0 as PlasmaComponents
|
import org.kde.plasma.components 3.0 as PlasmaComponents
|
||||||
|
|
|
||||||
|
|
@ -4,10 +4,10 @@
|
||||||
* SPDX-License-Identifier: GPL-2.0-or-later
|
* SPDX-License-Identifier: GPL-2.0-or-later
|
||||||
*/
|
*/
|
||||||
|
|
||||||
import QtQuick 2.15
|
import QtQuick
|
||||||
import QtQuick.Controls 2.15 as Controls
|
import QtQuick.Controls as Controls
|
||||||
import QtQuick.Layouts 1.1
|
import QtQuick.Layouts
|
||||||
import QtQuick.Window 2.2
|
import QtQuick.Window
|
||||||
|
|
||||||
import org.kde.plasma.core 2.1 as PlasmaCore
|
import org.kde.plasma.core 2.1 as PlasmaCore
|
||||||
import org.kde.plasma.components 3.0 as PlasmaComponents
|
import org.kde.plasma.components 3.0 as PlasmaComponents
|
||||||
|
|
|
||||||
|
|
@ -10,7 +10,6 @@ import QtQuick
|
||||||
import QtQuick.Controls as Controls
|
import QtQuick.Controls as Controls
|
||||||
import QtQuick.Layouts
|
import QtQuick.Layouts
|
||||||
import QtQuick.Window
|
import QtQuick.Window
|
||||||
import Qt5Compat.GraphicalEffects
|
|
||||||
|
|
||||||
import org.kde.plasma.core 2.0 as PlasmaCore
|
import org.kde.plasma.core 2.0 as PlasmaCore
|
||||||
import org.kde.plasma.extras 2.0 as PlasmaExtra
|
import org.kde.plasma.extras 2.0 as PlasmaExtra
|
||||||
|
|
|
||||||
|
|
@ -6,16 +6,16 @@
|
||||||
* SPDX-License-Identifier: LGPL-2.0-or-later
|
* SPDX-License-Identifier: LGPL-2.0-or-later
|
||||||
*/
|
*/
|
||||||
|
|
||||||
import QtQuick 2.15
|
import QtQuick
|
||||||
import QtQuick.Controls 2.15 as Controls
|
import QtQuick.Effects
|
||||||
import QtQuick.Layouts 1.15
|
import QtQuick.Controls as Controls
|
||||||
import Qt5Compat.GraphicalEffects
|
import QtQuick.Layouts
|
||||||
|
|
||||||
import org.kde.plasma.core 2.0 as PlasmaCore
|
import org.kde.plasma.core 2.0 as PlasmaCore
|
||||||
import org.kde.plasma.components 3.0 as PlasmaComponents
|
import org.kde.plasma.components 3.0 as PlasmaComponents
|
||||||
import org.kde.plasma.extras 2.0 as PlasmaExtras
|
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 org.kde.kirigami 2.19 as Kirigami
|
||||||
|
|
||||||
import "../../components" as Components
|
import "../../components" as Components
|
||||||
|
|
@ -150,16 +150,17 @@ Item {
|
||||||
background: Item {
|
background: Item {
|
||||||
|
|
||||||
// shadow for search window
|
// shadow for search window
|
||||||
RectangularGlow {
|
MultiEffect {
|
||||||
anchors.topMargin: 1
|
|
||||||
anchors.fill: parent
|
anchors.fill: parent
|
||||||
cached: true
|
source: rectBackground
|
||||||
glowRadius: 4
|
blurMax: 16
|
||||||
spread: 0.2
|
shadowEnabled: true
|
||||||
color: Qt.rgba(0, 0, 0, 0.15)
|
shadowVerticalOffset: 1
|
||||||
|
shadowOpacity: 0.15
|
||||||
}
|
}
|
||||||
|
|
||||||
Rectangle {
|
Rectangle {
|
||||||
|
id: rectBackground
|
||||||
anchors.fill: parent
|
anchors.fill: parent
|
||||||
color: PlasmaCore.Theme.backgroundColor
|
color: PlasmaCore.Theme.backgroundColor
|
||||||
radius: PlasmaCore.Units.smallSpacing
|
radius: PlasmaCore.Units.smallSpacing
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue