Merge lp:~tiagosh/unity-2d/bugfix-838708 into lp:unity-2d

[Tiago Salem Herrmann]

This merge request intends to fix lp:838708, making BFB behavior and visual match the design.

[lp:~tiagosh/unity-2d/bugfix-838708]

828. By Tiago Salem Herrmann on 2011-12-14

[launcher] make bfb totally opaque while the launcher background design is not fully implemented

[Lohith D Shivamurthy (dyams)]

Hey Tiagosh, You have effectively removed the 'tileBackground' in LauncherItem by setting its opacity to zero.
Now its useful only while animating 'launching'.
Is that correct? Could you please check it again?

review: Needs Information (code)

[lp:~tiagosh/unity-2d/bugfix-838708]

829. By Tiago Salem Herrmann on 2011-12-20

[launcher] fix previous commit. Make it fully opaque by setting it to 1

[Tiago Salem Herrmann (tiagosh)]

It was a mistake. Just fixed.

[Lohith D Shivamurthy (dyams)]

> It was a mistake. Just fixed.

Thank you.
You have removed the blend effect for 'BFB' tileBackground.
File LauncherItem.qml, Line #215
The other tiles have that effect still.
Is that intentional? Bug report says that that effect is needed for BFB though.

[Gerry Boland (gerboland)]

Yes its intentional. Since we are missing the blurred & tinted background, the blend effect makes the BFB very hard to see. This is a compromise for now.

[Lohith D Shivamurthy (dyams)]

> Yes its intentional. Since we are missing the blurred & tinted background, the
> blend effect makes the BFB very hard to see. This is a compromise for now.
OK, I agree with you.

Looking good and It is good to approve this already.
Approving.

review: Approve

=== modified file 'launcher/LauncherItem.qml'
--- launcher/LauncherItem.qml	2011-12-19 09:11:18 +0000
+++ launcher/LauncherItem.qml	2011-12-20 14:54:24 +0000
@@ -54,6 +54,7 @@
 
     height: selectionOutlineSize
 
+    property bool isBfb: false
     property int tileSize
     property int selectionOutlineSize
     property alias name: looseItem.objectName
@@ -200,6 +201,7 @@
                 property color color: defaultBackgroundColor
                 anchors.fill: parent
                 smooth: true
+                opacity: 1
 
                 SequentialAnimation on opacity {
                     NumberAnimation { to: 0.0; duration: 1000; easing.type: Easing.InOutQuad }
@@ -213,6 +215,13 @@
                 sourceSize.width: item.tileSize
                 sourceSize.height: item.tileSize
                 source: {
+                    if (isBfb) {
+                        if(launcherView.focus && item.activeFocus) {
+                            return "artwork/squircle_base_selected_54.png"
+                        } else {
+                            return "artwork/squircle_base_54.png"
+                        }
+                    }
                     var actualColor = launcherView.focus && item.activeFocus ? selectedBackgroundColor : color
                     return "image://blended/%1color=%2alpha=%3"
                         .arg("artwork/round_corner_54x54.png")
@@ -275,7 +284,7 @@
                 anchors.fill: parent
                 smooth: true
 
-                source: "artwork/round_shine_54x54.png"
+                source: isBfb ? "artwork/squircle_shine_54.png" : "artwork/round_shine_54x54.png"
                 sourceSize.width: item.tileSize
                 sourceSize.height: item.tileSize
             }
@@ -285,7 +294,7 @@
                 objectName: "selectionOutline"
                 anchors.centerIn: parent
                 smooth: true
-                source: "artwork/round_selected_66x66.png"
+                source:  isBfb ? "artwork/squircle_glow_54.png" : "artwork/round_selected_66x66.png"
                 visible: launcherView.focus && item.activeFocus
             }
 

=== modified file 'launcher/LauncherList.qml'
--- launcher/LauncherList.qml	2011-12-19 09:11:18 +0000
+++ launcher/LauncherList.qml	2011-12-20 14:54:24 +0000
@@ -137,6 +137,8 @@
         onDragEnter: item.onDragEnter(event)
         onDrop: item.onDrop(event)
 
+        isBfb: (item.toString().indexOf("BfbItem") == 0)
+
         function showMenu() {
             /* Prevent the simultaneous display of multiple menus */
             if (list.visibleMenu != item.menu && list.visibleMenu != undefined) {

=== added file 'launcher/artwork/squircle_base_54.png'
Binary files launcher/artwork/squircle_base_54.png	1970-01-01 00:00:00 +0000 and launcher/artwork/squircle_base_54.png	2011-12-20 14:54:24 +0000 differ
=== added file 'launcher/artwork/squircle_base_selected_54.png'
Binary files launcher/artwork/squircle_base_selected_54.png	1970-01-01 00:00:00 +0000 and launcher/artwork/squircle_base_selected_54.png	2011-12-20 14:54:24 +0000 differ
=== added file 'launcher/artwork/squircle_glow_54.png'
Binary files launcher/artwork/squircle_glow_54.png	1970-01-01 00:00:00 +0000 and launcher/artwork/squircle_glow_54.png	2011-12-20 14:54:24 +0000 differ
=== added file 'launcher/artwork/squircle_shine_54.png'
Binary files launcher/artwork/squircle_shine_54.png	1970-01-01 00:00:00 +0000 and launcher/artwork/squircle_shine_54.png	2011-12-20 14:54:24 +0000 differ