Merge lp:~mzanetti/unity8/panel-buttons-fixes into lp:unity8

[Michael Zanetti]

Unmerged revisions

1711. By Michael Zanetti on 2015-04-16

some fixes for the panel buttons

1710. By Launchpad Translations on behalf of unity-team on 2015-04-10

Launchpad automatic translations update.

=== modified file 'qml/Shell.qml'
--- qml/Shell.qml	2015-04-09 14:01:00 +0000
+++ qml/Shell.qml	2015-04-16 13:34:25 +0000
@@ -37,6 +37,7 @@
 import "Stages"
 import "Tutorial"
 import "Wizard"
+import "Components/PanelState"
 import Unity.Notifications 1.0 as NotificationBackend
 import Unity.Session 0.1
 import Unity.DashCommunicator 0.1
@@ -218,6 +219,13 @@
             }
         }
 
+        Binding {
+            target: PanelState
+            property: "buttonsVisible"
+            value: false
+            when: usageModeSettings.usageMode !== "Windowed"
+        }
+
         Loader {
             id: applicationsDisplayLoader
             objectName: "applicationsDisplayLoader"

=== modified file 'qml/Stages/DesktopStage.qml'
--- qml/Stages/DesktopStage.qml	2015-03-13 19:18:35 +0000
+++ qml/Stages/DesktopStage.qml	2015-04-16 13:34:25 +0000
@@ -58,7 +58,7 @@
         id: priv
 
         readonly property string focusedAppId: ApplicationManager.focusedApplicationId
-        readonly property var focusedAppDelegate: focusedAppId ? appRepeater.itemAt(indexOf(focusedAppId)) : null
+        readonly property var focusedAppDelegate: focusedAppId && appRepeater.count == ApplicationManager.count ? appRepeater.itemAt(indexOf(focusedAppId)) : null
 
         function indexOf(appId) {
             for (var i = 0; i < ApplicationManager.count; i++) {
@@ -85,6 +85,10 @@
         value: priv.focusedAppDelegate !== null && priv.focusedAppDelegate.state === "maximized"
     }
 
+    Component.onDestruction: {
+        PanelState.buttonsVisible = false;
+    }
+
     Repeater {
         id: appRepeater
         model: ApplicationManager