Paste P395

Elisa sidebar with colored backgrounds
ActivePublic

Authored by ngraham on May 30 2019, 8:35 PM.
diff --git a/src/qml/ViewSelector.qml b/src/qml/ViewSelector.qml
diff --git a/src/qml/ViewSelector.qml b/src/qml/ViewSelector.qml
index c391a34..a8f9a8c 100644
--- a/src/qml/ViewSelector.qml
+++ b/src/qml/ViewSelector.qml
@@ -91,19 +91,18 @@ FocusScope {
Rectangle {
- border {
- color: ((viewModeView.currentIndex === index && rootFocusScope.activeFocus) ? myPalette.highlight : "transparent")
- width: 1
- }
-
- Behavior on border.color {
- ColorAnimation {
- duration: 300
+ color: if (viewModeView.currentIndex === index) {
+ if (rootFocusScope.activeFocus) {
+ return myPalette.highlight
+ } else {
+ return myPalette.mid
}
+ } else if (itemMouseArea.containsMouse) {
+ return Qt.rgba(myPalette.highlight.r, myPalette.highlight.g, myPalette.highlight.b, 0.2)
+ } else {
+ return "transparent"
}
- radius: 3
-
anchors.fill: parent
Loader {
@@ -197,14 +196,6 @@ FocusScope {
duration: 150
}
}
-
- color: (viewModeView.currentIndex === index || itemMouseArea.containsMouse ? myPalette.highlight : myPalette.text)
-
- Behavior on color {
- ColorAnimation {
- duration: 300
- }
- }
}
}