diff --git a/indicators/org.kde.latte.plasma/package/ui/BackLayer.qml b/indicators/org.kde.latte.plasma/package/ui/BackLayer.qml index 8c0e2905..cfdc7112 100644 --- a/indicators/org.kde.latte.plasma/package/ui/BackLayer.qml +++ b/indicators/org.kde.latte.plasma/package/ui/BackLayer.qml @@ -1,137 +1,131 @@ /* * Copyright 2019 Michail Vourlakos * * This file is part of Latte-Dock * * Latte-Dock 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. * * Latte-Dock 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, see . */ import QtQuick 2.0 import org.kde.plasma.core 2.0 as PlasmaCore import org.kde.latte 0.2 as Latte PlasmaCore.FrameSvgItem { id: frame property string basePrefix: "normal" imagePath: indicator.usePlasmaTabsStyle ? "widgets/tabbar" : "widgets/tasks" + rotation: indicator.shared.reversed ? 180 : 0 + prefix: { if (indicator.usePlasmaTabsStyle) { if (!indicator.isActive) { return ""; } - if ((plasmoid.location === PlasmaCore.Types.LeftEdge && !indicator.shared.reversed) - || (plasmoid.location === PlasmaCore.Types.RightEdge && indicator.shared.reversed)) { + if (plasmoid.location === PlasmaCore.Types.LeftEdge) { return "west-active-tab"; } - if ((plasmoid.location === PlasmaCore.Types.TopEdge && !indicator.shared.reversed) - || (plasmoid.location === PlasmaCore.Types.BottomEdge && indicator.shared.reversed)) { + if (plasmoid.location === PlasmaCore.Types.TopEdge) { return "north-active-tab"; } - if ((plasmoid.location === PlasmaCore.Types.RightEdge && !indicator.shared.reversed) - || (plasmoid.location === PlasmaCore.Types.LeftEdge && indicator.shared.reversed)) { + if (plasmoid.location === PlasmaCore.Types.RightEdge) { return "east-active-tab"; } - if ((plasmoid.location === PlasmaCore.Types.BottomEdge && !indicator.shared.reversed) - || (plasmoid.location === PlasmaCore.Types.TopEdge && indicator.shared.reversed)) { + if (plasmoid.location === PlasmaCore.Types.BottomEdge) { return "south-active-tab"; } return "south-active-tab"; } else { return taskPrefix(basePrefix); } } function taskPrefix(prefix) { var effectivePrefix; - if ((plasmoid.location === PlasmaCore.Types.LeftEdge && !indicator.shared.reversed) - || (plasmoid.location === PlasmaCore.Types.RightEdge && indicator.shared.reversed)) { + if (plasmoid.location === PlasmaCore.Types.LeftEdge) { effectivePrefix = "west-" + prefix; } - if ((plasmoid.location === PlasmaCore.Types.TopEdge && !indicator.shared.reversed) - || (plasmoid.location === PlasmaCore.Types.BottomEdge && indicator.shared.reversed)) { + if (plasmoid.location === PlasmaCore.Types.TopEdge) { effectivePrefix = "north-" + prefix; } - if ((plasmoid.location === PlasmaCore.Types.RightEdge && !indicator.shared.reversed) - || (plasmoid.location === PlasmaCore.Types.LeftEdge && indicator.shared.reversed)) { + if (plasmoid.location === PlasmaCore.Types.RightEdge) { effectivePrefix = "east-" + prefix; } - if ((plasmoid.location === PlasmaCore.Types.BottomEdge && !indicator.shared.reversed) - || (plasmoid.location === PlasmaCore.Types.TopEdge && indicator.shared.reversed)) { + if (plasmoid.location === PlasmaCore.Types.BottomEdge) { effectivePrefix = "south-" + prefix; } return [effectivePrefix, prefix]; } states: [ State { name: "launcher" when: indicator.isLauncher || (indicator.isApplet && !indicator.isActive) PropertyChanges { target: frame basePrefix: "" } }, State { name: "hovered" when: indicator.isHovered && frame.hasElementPrefix("hover") PropertyChanges { target: frame basePrefix: "hover" } }, State { name: "attention" when: indicator.inAttention PropertyChanges { target: frame basePrefix: "attention" } }, State { name: "minimized" when: indicator.isMinimized PropertyChanges { target: frame basePrefix: "minimized" } }, State { name: "active" when: indicator.isActive PropertyChanges { target: frame basePrefix: "focus" } } ] }