Merge lp:~fboucault/unity-2d/dash_proper_hover into lp:unity-2d/3.0

[Florian Boucault]

[dash] Removed 'hover' state everywhere but in search results and home screen shortctus.
In these 2 places the style was adapted to look better and also closer to Unity's.
HomeButton now expands its label when focused.

[lp:~fboucault/unity-2d/dash_proper_hover]

683. By Florian Boucault on 2011-08-23

Added missing ButtonBackground.

684. By Florian Boucault on 2011-08-23

Merged trunk

[Gerry Boland (gerboland)]

Works ok, accepted.

review: Approve

=== removed file 'places/Button.qml'
--- places/Button.qml	2011-08-09 16:18:45 +0000
+++ places/Button.qml	1970-01-01 00:00:00 +0000
@@ -1,43 +0,0 @@
-/*
- * This file is part of unity-2d
- *
- * Copyright 2010-2011 Canonical Ltd.
- *
- * This program 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; version 3.
- *
- * This program 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 <http://www.gnu.org/licenses/>.
- */
-
-import QtQuick 1.0
-
-AbstractButton {
-    Rectangle {
-        anchors.fill: parent
-        anchors.bottomMargin: 1
-        anchors.rightMargin: 1
-        opacity: ( parent.state == "selected" || parent.state == "pressed"
-                  || parent.state == "hovered" ) ? 1.0 : 0.0
-
-        color: parent.state == "pressed" ? "#ffffffff" : "#00000000"
-        border.color: "#cccccc"
-        border.width: 1
-        radius: 3
-
-        Behavior on opacity {NumberAnimation {duration: 100}}
-
-        Image {
-            fillMode: Image.Tile
-            anchors.fill: parent
-            source: "artwork/button_background.png"
-            smooth: false
-        }
-    }
-}

=== added file 'places/ButtonBackground.qml'
--- places/ButtonBackground.qml	1970-01-01 00:00:00 +0000
+++ places/ButtonBackground.qml	2011-08-23 17:40:25 +0000
@@ -0,0 +1,31 @@
+import QtQuick 1.0
+
+Item {
+    id: background
+
+    property string state
+
+    opacity: ( state == "selected" || state == "pressed"
+              || state == "hovered" ) ? 1.0 : 0.0
+    Behavior on opacity {NumberAnimation {duration: 100}}
+
+    Rectangle {
+
+        /* FIXME: */
+        anchors.fill: parent
+        anchors.bottomMargin: 1
+        anchors.rightMargin: 1
+
+        color: background.state == "pressed" ? "#ffffffff" : "#00000000"
+        border.color: "#cccccc"
+        border.width: 1
+        radius: 3
+
+        Image {
+            fillMode: Image.Tile
+            anchors.fill: parent
+            source: "artwork/button_background.png"
+            smooth: false
+        }
+    }
+}

=== modified file 'places/Home.qml'
--- places/Home.qml	2011-08-10 10:01:52 +0000
+++ places/Home.qml	2011-08-23 17:40:25 +0000
@@ -56,7 +56,7 @@
     /* Used by dash.qml to bind to dashView "expanded" property */
     property bool expanded: globalSearchActive || shortcutsActive
 
-    Button {
+    AbstractButton {
         id: openShortcutsButton
 
         anchors.bottom: parent.top
@@ -146,7 +146,7 @@
             color: Qt.rgba(0, 0, 0, 0.3)
         }
 
-        Button {
+        AbstractButton {
             id: closeShortcutsButton
 
             anchors.left: parent.left

=== modified file 'places/HomeButton.qml'
--- places/HomeButton.qml	2011-08-23 15:47:49 +0000
+++ places/HomeButton.qml	2011-08-23 17:40:25 +0000
@@ -18,7 +18,9 @@
 
 import QtQuick 1.0
 
-Button {
+AbstractButton {
+    id: button
+
     property alias icon: icon.source
     property alias label: label.text
     property alias iconSourceSize: icon.sourceSize
@@ -26,37 +28,38 @@
     width: 160
     height: 172
 
-    Item {
-        anchors.right: parent.right
-        anchors.left: parent.left
+    ButtonBackground {
+        anchors.fill: icon
+        anchors.margins: -5
+        state: button.state
+    }
+
+    Image {
+        id: icon
+
+        width: sourceSize.width
+        height: sourceSize.height
+
+        anchors.horizontalCenter: parent.horizontalCenter
         anchors.top: parent.top
-        anchors.bottom: label.bottom
-        anchors.bottomMargin: 30
-
-        Image {
-            id: icon
-
-            width: sourceSize.width
-            height: sourceSize.height
-
-            anchors.centerIn: parent
-            fillMode: Image.PreserveAspectFit
-
-            asynchronous: true
-            opacity: status == Image.Ready ? 1 : 0
-            Behavior on opacity {NumberAnimation {duration: 200; easing.type: Easing.InOutQuad}}
-        }
+        anchors.topMargin: 5
+        fillMode: Image.PreserveAspectFit
+
+        asynchronous: true
+        opacity: status == Image.Ready ? 1 : 0
+        Behavior on opacity {NumberAnimation {duration: 200; easing.type: Easing.InOutQuad}}
     }
 
     TextMultiLine {
         id: label
 
-        color: parent.state == "pressed" ? "#444444" : "#ffffff"
+        color: "#ffffff"
+        state: ( parent.state == "selected" || parent.state == "hovered" ) ? "expanded" : ""
         horizontalAlignment: Text.AlignHCenter
-        anchors.bottom: parent.bottom
+        anchors.top: icon.bottom
         anchors.right: parent.right
         anchors.left: parent.left
-        anchors.bottomMargin: 3
+        anchors.topMargin: 8
         anchors.rightMargin: 5
         anchors.leftMargin: 7
         height: 40

=== modified file 'places/UnityDefaultRenderer.qml'
--- places/UnityDefaultRenderer.qml	2011-08-23 16:27:12 +0000
+++ places/UnityDefaultRenderer.qml	2011-08-23 17:40:25 +0000
@@ -21,12 +21,14 @@
 
 RendererGrid {
     cellWidth: 100
-    cellHeight: 108
+    cellHeight: 112
     horizontalSpacing: 42
     verticalSpacing: 20
 
     cellRenderer: Component {
-        Button {
+        AbstractButton {
+            id: button
+
             property string uri
             property string iconHint
             property string mimetype
@@ -66,6 +68,12 @@
                 onDrop: parent.pressed = false
             }
 
+            ButtonBackground {
+                anchors.fill: icon
+                anchors.margins: -4
+                state: button.state
+            }
+
             Image {
                 id: icon
 
@@ -74,6 +82,7 @@
                 height: 64
                 anchors.horizontalCenter: parent.horizontalCenter
                 anchors.top: parent.top
+                anchors.topMargin: 4
                 fillMode: Image.PreserveAspectFit
                 sourceSize.width: width
                 sourceSize.height: height
@@ -87,7 +96,7 @@
                 id: label
 
                 text: displayName
-                color: parent.state == "pressed" ? "#5e5e5e" : "#ffffff"
+                color: "#ffffff"
                 state: ( parent.state == "selected" || parent.state == "hovered" ) ? "expanded" : ""
                 horizontalAlignment: Text.AlignHCenter
                 anchors.top: icon.bottom

=== modified file 'places/UnityEmptySearchRenderer.qml'
--- places/UnityEmptySearchRenderer.qml	2011-07-24 16:23:00 +0000
+++ places/UnityEmptySearchRenderer.qml	2011-08-23 17:40:25 +0000
@@ -41,7 +41,9 @@
         orientation: ListView.Vertical
 
         model: renderer.group_model
-        delegate: Button {
+        delegate: AbstractButton {
+            id: button
+
             property string uri: column_0
             property string iconHint: column_1
             property string groupId: column_2
@@ -59,6 +61,11 @@
                 placeEntryModel.place.activate(uri)
             }
 
+            ButtonBackground {
+                anchors.fill: parent
+                state: button.state
+            }
+
             TextCustom {
                 text: displayName
                 font.pixelSize: 16

=== modified file 'places/UnityFileInfoRenderer.qml'
--- places/UnityFileInfoRenderer.qml	2011-08-23 15:47:49 +0000
+++ places/UnityFileInfoRenderer.qml	2011-08-23 17:40:25 +0000
@@ -25,7 +25,7 @@
     verticalSpacing: 26
 
     cellRenderer: Component {
-        Button {
+        AbstractButton {
             id: button
 
             property url uri
@@ -50,6 +50,11 @@
 
             onClicked: placeEntryModel.place.activate(decodeURIComponent(uri.toString()))
 
+            ButtonBackground {
+                anchors.fill: parent
+                state: button.state
+            }
+
             Image {
                 id: icon
 

=== modified file 'places/UnityHorizontalTileRenderer.qml'
--- places/UnityHorizontalTileRenderer.qml	2011-06-22 12:47:52 +0000
+++ places/UnityHorizontalTileRenderer.qml	2011-08-23 17:40:25 +0000
@@ -26,7 +26,7 @@
     verticalSpacing: 10
 
     cellRenderer: Component {
-        Button {
+        AbstractButton {
             id: button
 
             property string uri
@@ -68,6 +68,11 @@
                 onDrop: parent.pressed = false
             }
 
+            ButtonBackground {
+                anchors.fill: parent
+                state: button.state
+            }
+
             Image {
                 id: icon
 

=== modified file 'places/dash.qml'
--- places/dash.qml	2011-08-23 15:00:31 +0000
+++ places/dash.qml	2011-08-23 17:40:25 +0000
@@ -232,7 +232,7 @@
         }
     }
 
-    Button {
+    AbstractButton {
         id: fullScreenButton
         anchors.bottom: parent.bottom
         anchors.right: parent.right