Merge lp:~sladen/unity-2d/unity-2d-no-glow-lp933578 into lp:unity-2d

[Paul Sladen]

No Glow assets + fixups for (LP: #933578)
This includes replacements assets for:
  Pips + arrows
  Dash search box and search box status icons
  Dash edge background (transparent)
  Dash edge background (non-transparent)
With associated code changes:
  Removal of blurRadius except for background itself
  Background tiling phase realignment for transparent background

[Michał Sawicz (saviq)]

Just removing "blurRadius" from DropShadows means the shadow will actually be there, and drawn, just that it won't blur. So you end up with a (expensive) copy of the text behind it.

Please completely remove the whole "effect: DropShadow {...}" properties to actually get rid of the shadows.

review: Needs Fixing

[Michał Sawicz (saviq)]

Please also provide a before and after images for design sign-off.

review: Needs Fixing

[Michał Sawicz (saviq)]

We need a way to indicate focus on the "Filter results", it was only being highlighted with the glow, now it's too easy to get "lost" in the dash when keyboard-navigating.

We have a similar issue with category headers that don't have "expand" links, so consistency here would probably make sense (not "it's broken" consistency, but a way to indicate focus on them).

review: Needs Fixing

[Paul Sladen (sladen)]

I believe in all of these locations hover/focus is indicated by colour:white && blurRadius. The colour: white is still there and continues to provide the primary highlight.

There is a design solution for replacing the white highlight with a full-width background grey highlight, and this is in Unity 3D. However, Gerry requested that the merge say on focus and be a minimal diff without other changes other than removing the glow from the assets and code.

[Paul Sladen (sladen)]

Before, After, and Delta screenshots attached to parent bug report.

review: Needs Resubmitting

[Michał Sawicz (saviq)]

> I believe in all of these locations hover/focus is indicated by colour:white
> && blurRadius. The colour: white is still there and continues to provide the
> primary highlight.

> There is a design solution for replacing the white highlight with a full-width
> background grey highlight, and this is in Unity 3D.

Except that the label I mentioned ("Filter results") is already white, so we lose
focus indication completely. Please leave that one instance of the glow in place,
we'll fix the whole approach to focus in dash in a separate MR.

> However, Gerry requested that the merge say on focus and be a minimal diff
> without other changes other than removing the glow from the assets and code.

That's ok, but just removing the blurRadius property doesn't make sense. The whole
"effect: DropShadow { ... }" component is responsible for just the glow, so to remove
the glow we need to remove the whole of it.

[Paul Sladen (sladen)]

Done on both accounts.

review: Needs Resubmitting

[Michał Sawicz (saviq)]

One last thing:
=== renamed file 'shell/launcher/artwork/launcher_pip_ltr.png' => 'shell/launcher/artwork/launcher_pip_ltr.png.OTHER'

That doesn't look right?

review: Needs Fixing

[lp:~sladen/unity-2d/unity-2d-no-glow-lp933578]

944. By Paul Sladen on 2012-02-27

Merge to HEAD; manually resolve binary merge conflict:
  shell/launcher/artwork/launcher_pip_ltr.png

945. By Paul Sladen on 2012-02-27

Restore property moving && associated workaround warnings

[Xi Zhu (xi.zhu)]

No glow is fine.

review: Approve (design)

[Gerry Boland (gerboland)]

Functional test looks good, code looks ok, approving!

Thank you Paul.
-G

review: Approve (functional)

=== modified file 'shell/common/SearchEntry.qml'
--- shell/common/SearchEntry.qml	2012-02-15 13:26:26 +0000
+++ shell/common/SearchEntry.qml	2012-02-27 16:59:19 +0000
@@ -87,16 +87,6 @@
             Accessible.name: searchInstructions.text
             Accessible.role: Accessible.EditableText
 
-            effect: DropShadow {
-                    id: glow
-
-                    blurRadius: 4
-                    offset.x: 0
-                    offset.y: 0
-                    color: "white"
-                    enabled: searchInput.text != "" || searchInput.inputMethodComposing
-                }
-
             anchors.left: searchIcon.right
             anchors.leftMargin: -5
             anchors.right: parent.right
 
=== modified file 'shell/common/artwork/desktop_dash_background.png'
 Binary files shell/common/artwork/desktop_dash_background.png	2012-01-30 17:23:42 +0000 and shell/common/artwork/desktop_dash_background.png	2012-02-27 16:59:19 +0000 differ
=== modified file 'shell/common/artwork/desktop_dash_background.sci'
--- shell/common/artwork/desktop_dash_background.sci	2012-01-30 17:23:42 +0000
+++ shell/common/artwork/desktop_dash_background.sci	2012-02-27 16:59:19 +0000
@@ -1,7 +1,7 @@
 border.left: 0
 border.top: 0
-border.bottom: 45
-border.right: 46
+border.bottom: 43
+border.right: 44
 source: desktop_dash_background.png
 horizontalTileRule: Repeat
 verticalTileRule: Repeat
 
=== modified file 'shell/common/artwork/desktop_dash_background_no_transparency.png'
 Binary files shell/common/artwork/desktop_dash_background_no_transparency.png	2012-01-30 17:23:42 +0000 and shell/common/artwork/desktop_dash_background_no_transparency.png	2012-02-27 16:59:19 +0000 differ
=== modified file 'shell/common/artwork/search_background.png'
 Binary files shell/common/artwork/search_background.png	2012-02-01 23:52:38 +0000 and shell/common/artwork/search_background.png	2012-02-27 16:59:19 +0000 differ
=== modified file 'shell/common/artwork/search_icon.png'
 Binary files shell/common/artwork/search_icon.png	2012-02-01 23:52:38 +0000 and shell/common/artwork/search_icon.png	2012-02-27 16:59:19 +0000 differ
=== modified file 'shell/dash/CategoryHeader.qml'
--- shell/dash/CategoryHeader.qml	2012-01-10 16:52:24 +0000
+++ shell/dash/CategoryHeader.qml	2012-02-27 16:59:19 +0000
@@ -36,14 +36,6 @@
 
     Accessible.name: "%1 %2 %3".arg(title.text).arg(label.text).arg(folded ? u2d.tr("not expanded") : u2d.tr("expanded"))
 
-    effect: DropShadow {
-                blurRadius: 6
-                offset.x: 0
-                offset.y: 0
-                color: "white"
-                enabled: ( categoryHeader.state == "pressed" && !moving )
-            }
-
     Image {
         id: iconImage
 
@@ -81,14 +73,6 @@
                   || categoryHeader.state == "hovered" ) ? 1.0 : 0.5
         Behavior on opacity {NumberAnimation { duration: 100 }}
 
-        effect: DropShadow {
-                    blurRadius: 4
-                    offset.x: 0
-                    offset.y: 0
-                    color: "white"
-                    enabled: ( moreResults.opacity == 1.0 && !moving )
-                }
-
         TextCustom {
             id: label
 
 
=== modified file 'shell/dash/LensBar.qml'
--- shell/dash/LensBar.qml	2012-02-10 20:25:00 +0000
+++ shell/dash/LensBar.qml	2012-02-27 16:59:19 +0000
@@ -43,12 +43,6 @@
     }
 
     /* LensBar contains a row of LensButtons */
-
-    /* Ugly Hack: the DropShadow effect on the Home lensButton causes visual artifacts as
-       the list of lenses is being populated, when the inter-lensButton spacing is non-zero.
-       A previously painted DropShadow remains in the (transparent) inter-lensButton space.
-       Can work around this by removing spacing and instead add padding to each lensButton.
-       DropShadow not officially supported until Qt4.8, when hopefully this will be fixed. */
     Row {
         id: lensContainer
 
 
=== modified file 'shell/dash/LensButton.qml'
--- shell/dash/LensButton.qml	2011-12-08 19:16:20 +0000
+++ shell/dash/LensButton.qml	2012-02-27 16:59:19 +0000
@@ -31,14 +31,6 @@
 
     id: lensButton
 
-    effect: DropShadow {
-         blurRadius: 8
-         color: "white"
-         offset.x: 0
-         offset.y: 0
-         enabled: ( lensButton.state == "selected" || active )
-    }
-
     Rectangle {
         anchors.fill: parent
         anchors.topMargin: 7
 
=== modified file 'shell/dash/MultiRangeButton.qml'
--- shell/dash/MultiRangeButton.qml	2011-11-29 17:45:27 +0000
+++ shell/dash/MultiRangeButton.qml	2012-02-27 16:59:19 +0000
@@ -43,13 +43,6 @@
         text: multiRangeButton.text
         elide: Text.ElideRight
 
-        effect: DropShadow {
-             blurRadius: 8
-             color: "white"
-             offset.x: 0
-             offset.y: 0
-             enabled: ( multiRangeButton.state == "selected" )
-        }
     }
 
     Rectangle {
 
=== modified file 'shell/dash/Star.qml'
--- shell/dash/Star.qml	2011-11-25 15:44:18 +0000
+++ shell/dash/Star.qml	2012-02-27 16:59:19 +0000
@@ -29,13 +29,6 @@
     width: childrenRect.width
     height: childrenRect.height
 
-    effect: DropShadow {
-         blurRadius: 8
-         color: "white"
-         offset.x: 0
-         offset.y: 0
-    }
-
     Image {
         width: sourceSize.width
         height: sourceSize.height
 
=== modified file 'shell/dash/TickBox.qml'
--- shell/dash/TickBox.qml	2012-01-10 16:52:24 +0000
+++ shell/dash/TickBox.qml	2012-02-27 16:59:19 +0000
@@ -33,14 +33,6 @@
     width: childrenRect.width
     height: childrenRect.height
 
-    effect: DropShadow {
-         blurRadius: 8
-         color: "white"
-         offset.x: 0
-         offset.y: 0
-         enabled: ( tickBox.state == "selected" )
-    }
-
     Rectangle {
         id: container
 
 
=== modified file 'shell/launcher/artwork/launcher_pip_ltr.png'
 Binary files shell/launcher/artwork/launcher_pip_ltr.png	2012-02-18 15:15:31 +0000 and shell/launcher/artwork/launcher_pip_ltr.png	2012-02-27 16:59:19 +0000 differ