Merge lp:~gerboland/unity-2d/launcher-tweaks into lp:unity-2d

[Gerry Boland]

[launcher] Pixel-perfection changes: add glow-less assets, position tiles 6 pixels from screen edge, add white 15% opaque line as launcher border, and move activity pip to border this line. Context menu arrow overlaps activity pip.

[Michał Sawicz (saviq)]

Shouldn't we have a before / after screenshots here for design to sign off on?

review: Needs Information

[Gerry Boland (gerboland)]

Indeed I should have:
before: https://imgur.com/2OPel
after: https://imgur.com/wDIB0

[Gerry Boland (gerboland)]

And for the context menu:
before: https://imgur.com/a/ZZJQV
after: https://imgur.com/ga4az

[Xi Zhu (xi.zhu)]

review: Approve (design)

[lp:~gerboland/unity-2d/launcher-tweaks]

929. By Gerry Boland on 2012-02-24

Merge trunk

[Albert Astals Cid (aacid)]

In
 anchors.rightMargin: declarativeView.dashActive ? 0 : 1
should that 1 be border.width?

I find it confusing to have one Item Accessible.name: "borderWithDash" and id: border and then a different Item with Accessible.name: "border" and no id, woulnd't it be better to name the second one "borderWithoutDash" and not change the first one?

In the second "border" i think it'd be better if you bind all the other properties to the "first" border, so if something changes we just need to change one, i.e.

anchors.right: border.anchors.right
anchors.left: border.anchors.left
visible: !border.visible

[lp:~gerboland/unity-2d/launcher-tweaks]

930. By Gerry Boland on 2012-02-24

Use border.width instead of 1

931. By Gerry Boland on 2012-02-24

Border line & image share anchors

932. By Gerry Boland on 2012-02-24

Use better accessible name for border line

[Gerry Boland (gerboland)]

Ok, code-fixes made.

[Albert Astals Cid (aacid)]

I'll be more of a pain yet, i think m_arrowY value in LauncherContextualMenu::show should be set to 7 and not 6, otherwise the pip and the menu arrow do not totally overlap (Yes this nagged me the first time i saw it visually)

review: Needs Fixing

[Albert Astals Cid (aacid)]

Approving, the 7/6 thing is not something Gerry "broke" and actually while it looks better for me with a 7 it looks better for him with a 6, so future work

review: Approve

=== modified file 'shell/launcher/Launcher.qml'
--- shell/launcher/Launcher.qml	2012-02-23 10:13:49 +0000
+++ shell/launcher/Launcher.qml	2012-02-24 13:16:19 +0000
@@ -65,23 +65,38 @@
     Rectangle {
         Accessible.name: "background"
         anchors.fill: parent
+        anchors.rightMargin: declarativeView.dashActive ? 0 : border.width
         color: "black"
         opacity: 0.66
         visible: desktop.isCompositingManagerRunning
     }
 
     Image {
-        Accessible.name: "border"
+        Accessible.name: "borderWithDash"
         id: border
 
         width: 1
         height: parent.height
         anchors.right: Utils.isLeftToRight() ? parent.right : undefined
         anchors.left:  Utils.isLeftToRight() ? undefined : parent.left
+        visible: declarativeView.dashActive
         source: "artwork/border.png"
         fillMode: Image.Stretch
     }
 
+    Rectangle {
+        Accessible.name: "borderWithoutDash"
+
+        width: border.width
+        height: parent.height
+        anchors.right: border.anchors.right
+        anchors.left:  border.anchors.left
+        visible: !declarativeView.dashActive
+
+        color: "white"
+        opacity: 0.15
+    }
+
     onDesktopFileDropped: applications.insertFavoriteApplication(path)
     onWebpageUrlDropped: applications.insertWebFavorite(url)
 
@@ -90,6 +105,7 @@
 
         focus: true
         anchors.fill: parent
+        anchors.rightMargin: border.width
         z: 1 /* ensure the lists are always strictly on top of the background */
 
         LauncherList {

=== modified file 'shell/launcher/LauncherList.qml'
--- shell/launcher/LauncherList.qml	2012-02-23 11:23:52 +0000
+++ shell/launcher/LauncherList.qml	2012-02-24 13:16:19 +0000
@@ -157,7 +157,7 @@
                 list.visibleMenu.hide()
             }
             list.visibleMenu = item.menu
-            item.menu.show(width, declarativeView.globalPosition.y + list.y - list.contentY +
+            item.menu.show(width - 5, declarativeView.globalPosition.y + list.y - list.contentY +
                                   y + height - selectionOutlineSize / 2)
         }
 

=== modified file 'shell/launcher/artwork/launcher_arrow_ltr.png'
Binary files shell/launcher/artwork/launcher_arrow_ltr.png	2011-11-11 10:19:14 +0000 and shell/launcher/artwork/launcher_arrow_ltr.png	2012-02-24 13:16:19 +0000 differ
=== modified file 'shell/launcher/artwork/launcher_arrow_outline_ltr.png'
Binary files shell/launcher/artwork/launcher_arrow_outline_ltr.png	2012-01-23 13:23:59 +0000 and shell/launcher/artwork/launcher_arrow_outline_ltr.png	2012-02-24 13:16:19 +0000 differ
=== modified file 'shell/launcher/artwork/launcher_arrow_rtl.png'
Binary files shell/launcher/artwork/launcher_arrow_rtl.png	2011-11-11 10:19:14 +0000 and shell/launcher/artwork/launcher_arrow_rtl.png	2012-02-24 13:16:19 +0000 differ
=== modified file 'shell/launcher/artwork/launcher_pip_ltr.png'
Binary files shell/launcher/artwork/launcher_pip_ltr.png	2011-11-11 10:19:14 +0000 and shell/launcher/artwork/launcher_pip_ltr.png	2012-02-24 13:16:19 +0000 differ