From 2a1e2934dcd96a1995443bfe399d4a0bf7468275 Mon Sep 17 00:00:00 2001
From: Marco Martin <notmart@gmail.com>
Date: Tue, 24 Feb 2015 18:30:46 +0100
Subject: [PATCH] bottom bar always visible

---
 compositor/contents/Compositor.qml | 25 +++++++++++++++++++++++--
 shell/contents/views/Desktop.qml   | 13 ++++---------
 2 files changed, 27 insertions(+), 11 deletions(-)

diff --git a/compositor/contents/Compositor.qml b/compositor/contents/Compositor.qml
index df8d850e..6a90aa65 100644
--- a/compositor/contents/Compositor.qml
+++ b/compositor/contents/Compositor.qml
@@ -154,8 +154,8 @@ Rectangle {
         anchors.left: parent.left
         anchors.right: parent.right
         anchors.bottom: parent.bottom
-        height: compositorRoot.state == "homeScreen" ? 0 : bottomBarHeight
-        color: Qt.rgba(0, 0, 0, 0.9 + 0.1*windowsZoom.scale)
+        height: bottomBarHeight
+        color: Qt.rgba(0, 0, 0, 0.7)
 
         Behavior on height {
             NumberAnimation {
@@ -167,11 +167,32 @@ Rectangle {
         RowLayout {
             anchors.fill: parent
 
+            PlasmaCore.IconItem {
+                colorGroup: PlasmaCore.Theme.ComplementaryColorGroup
+                width: units.iconSizes.smallMedium
+                height: width
+                source: "distribute-horizontal-x"
+                enabled: compositorRoot.state != "switcher";
+                opacity: enabled ? 1 : 0.6
+
+                Layout.alignment: Qt.AlignHCenter
+                Layout.preferredWidth: units.iconSizes.medium
+                Layout.preferredHeight: units.iconSizes.medium
+
+                MouseArea {
+                    anchors.fill: parent
+                    onClicked: {
+                        compositorRoot.state = "switcher";
+                    }
+                }
+            }
             PlasmaCore.IconItem {
                 colorGroup: PlasmaCore.Theme.ComplementaryColorGroup
                 width: units.iconSizes.smallMedium
                 height: width
                 source: "go-home"
+                enabled: compositorRoot.state != "homeScreen";
+                opacity: enabled ? 1 : 0.6
 
                 Layout.alignment: Qt.AlignHCenter
                 Layout.preferredWidth: units.iconSizes.medium
diff --git a/shell/contents/views/Desktop.qml b/shell/contents/views/Desktop.qml
index 670d2869..0cbebb1c 100644
--- a/shell/contents/views/Desktop.qml
+++ b/shell/contents/views/Desktop.qml
@@ -312,7 +312,7 @@ Item {
             right: parent.right
         }
         height: units.iconSizes.small
-        z: 1
+        z: 2
         colorGroup: PlasmaCore.Theme.ComplementaryColorGroup
 
         Rectangle {
@@ -401,16 +401,11 @@ Item {
     PlasmaCore.ColorScope {
         z: 1
         anchors {
-            top: statusPanel.bottom
-            bottom: parent.bottom
-            left: parent.left
-            right: parent.right
+            fill: parent
         }
 
         colorGroup: PlasmaCore.Theme.ComplementaryColorGroup
 
-        
-
         SatelliteComponents.ApplicationListModel {
             id: appListModel
         }
@@ -432,7 +427,7 @@ Item {
             header: MouseArea {
                 z: 999
                 width: homescreen.width
-                height: homescreen.height
+                height: homescreen.height - units.iconSizes.medium
 
                 onPressAndHold: {
                     containment.action("configure").trigger();
@@ -504,7 +499,7 @@ Item {
                 SatelliteStripe {
                     id: stripe
                     z: 99
-                    y: Math.max(applications.contentY + parent.height, parent.height - height - statusPanel.height)
+                    y: Math.max(applications.contentY + parent.height, parent.height - height)
 
                     PlasmaCore.Svg {
                         id: stripeIcons