unity-2d

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

  1. unity-2d-no-glow-lp933578
  2. Merge into trunk
Proposed by Paul Sladen
Status: Superseded
Proposed branch: lp:~sladen/unity-2d/unity-2d-no-glow-lp933578
Merge into: lp:unity-2d
Diff against target: 126 lines (+2/-20)
8 files modified
shell/common/SearchEntry.qml (+0/-1)
shell/common/artwork/desktop_dash_background.sci (+2/-2)
shell/dash/CategoryHeader.qml (+0/-2)
shell/dash/FilterPane.qml (+0/-11)
shell/dash/LensButton.qml (+0/-1)
shell/dash/MultiRangeButton.qml (+0/-1)
shell/dash/Star.qml (+0/-1)
shell/dash/TickBox.qml (+0/-1)
To merge this branch: bzr merge lp:~sladen/unity-2d/unity-2d-no-glow-lp933578
Reviewer Review Type Date Requested Status
Paul Sladen (community) Needs Resubmitting
Michał Sawicz Needs Fixing
Gerry Boland Pending
Review via email: mp+94560@code.launchpad.net

This proposal has been superseded by a proposal from 2012-02-24.

Commit message

Unity 2D: No Glow assets + fixups for (LP: #933578)

Description of the change

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

To post a comment you must log in.
Revision history for this message
Michał Sawicz (saviq) wrote :

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
Revision history for this message
Michał Sawicz (saviq) wrote :

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

review: Needs Fixing
Revision history for this message
Michał Sawicz (saviq) wrote :

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
Revision history for this message
Paul Sladen (sladen) wrote :

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.

Revision history for this message
Paul Sladen (sladen) wrote :

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

review: Needs Resubmitting
Revision history for this message
Michał Sawicz (saviq) wrote :

> 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.

lp:~sladen/unity-2d/unity-2d-no-glow-lp933578 updated
940. By Paul Sladen

Glow: Temporaily glow/blur on "Filter Results" button to provide state constrast
per https://code.launchpad.net/~sladen/unity-2d/unity-2d-no-glow-lp933578/+merge/94560/comments/204013

941. By Paul Sladen

Drop DropShadow and associate /* HACK */ per
https://code.launchpad.net/~sladen/unity-2d/unity-2d-no-glow-lp933578/+merge/94560/comments/204013

942. By Paul Sladen

Additionally remove the second "Ugly Hack" message per Saviq
although it is unclear where the associate hack is/was

943. By Paul Sladen

Self-revert; LensView: restore the separate namespace "moving" usage

944. By Paul Sladen

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

945. By Paul Sladen

Restore property moving && associated workaround warnings

Unmerged revisions

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'shell/common/SearchEntry.qml'
--- shell/common/SearchEntry.qml 2012-02-15 13:26:26 +0000
+++ shell/common/SearchEntry.qml 2012-02-24 14:58:01 +0000
@@ -90,7 +90,6 @@
90 effect: DropShadow {90 effect: DropShadow {
91 id: glow91 id: glow
9292
93 blurRadius: 4
94 offset.x: 093 offset.x: 0
95 offset.y: 094 offset.y: 0
96 color: "white"95 color: "white"
9796
=== modified file 'shell/common/artwork/desktop_dash_background.png'
98Binary 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-24 14:58:01 +0000 differ97Binary 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-24 14:58:01 +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-24 14:58:01 +0000
@@ -1,7 +1,7 @@
1border.left: 01border.left: 0
2border.top: 02border.top: 0
3border.bottom: 453border.bottom: 43
4border.right: 464border.right: 44
5source: desktop_dash_background.png5source: desktop_dash_background.png
6horizontalTileRule: Repeat6horizontalTileRule: Repeat
7verticalTileRule: Repeat7verticalTileRule: Repeat
88
=== modified file 'shell/common/artwork/desktop_dash_background_no_transparency.png'
9Binary 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-24 14:58:01 +0000 differ9Binary 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-24 14:58:01 +0000 differ
=== modified file 'shell/common/artwork/search_background.png'
10Binary files shell/common/artwork/search_background.png 2012-02-01 23:52:38 +0000 and shell/common/artwork/search_background.png 2012-02-24 14:58:01 +0000 differ10Binary files shell/common/artwork/search_background.png 2012-02-01 23:52:38 +0000 and shell/common/artwork/search_background.png 2012-02-24 14:58:01 +0000 differ
=== modified file 'shell/common/artwork/search_icon.png'
11Binary files shell/common/artwork/search_icon.png 2012-02-01 23:52:38 +0000 and shell/common/artwork/search_icon.png 2012-02-24 14:58:01 +0000 differ11Binary files shell/common/artwork/search_icon.png 2012-02-01 23:52:38 +0000 and shell/common/artwork/search_icon.png 2012-02-24 14:58:01 +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-24 14:58:01 +0000
@@ -37,7 +37,6 @@
37 Accessible.name: "%1 %2 %3".arg(title.text).arg(label.text).arg(folded ? u2d.tr("not expanded") : u2d.tr("expanded"))37 Accessible.name: "%1 %2 %3".arg(title.text).arg(label.text).arg(folded ? u2d.tr("not expanded") : u2d.tr("expanded"))
3838
39 effect: DropShadow {39 effect: DropShadow {
40 blurRadius: 6
41 offset.x: 040 offset.x: 0
42 offset.y: 041 offset.y: 0
43 color: "white"42 color: "white"
@@ -82,7 +81,6 @@
82 Behavior on opacity {NumberAnimation { duration: 100 }}81 Behavior on opacity {NumberAnimation { duration: 100 }}
8382
84 effect: DropShadow {83 effect: DropShadow {
85 blurRadius: 4
86 offset.x: 084 offset.x: 0
87 offset.y: 085 offset.y: 0
88 color: "white"86 color: "white"
8987
=== modified file 'shell/dash/FilterPane.qml'
--- shell/dash/FilterPane.qml 2012-01-10 17:31:32 +0000
+++ shell/dash/FilterPane.qml 2012-02-24 14:58:01 +0000
@@ -36,17 +36,6 @@
36 Accessible.name: title.text36 Accessible.name: title.text
3737
38 effect: DropShadow {38 effect: DropShadow {
39 blurRadius: {
40 switch (header.state) {
41 case "selected":
42 case "hovered":
43 return 4
44 case "pressed":
45 return 8
46 default:
47 return 0
48 }
49 }
50 offset.x: 039 offset.x: 0
51 offset.y: 040 offset.y: 0
52 color: "white"41 color: "white"
5342
=== modified file 'shell/dash/LensButton.qml'
--- shell/dash/LensButton.qml 2011-12-08 19:16:20 +0000
+++ shell/dash/LensButton.qml 2012-02-24 14:58:01 +0000
@@ -32,7 +32,6 @@
32 id: lensButton32 id: lensButton
3333
34 effect: DropShadow {34 effect: DropShadow {
35 blurRadius: 8
36 color: "white"35 color: "white"
37 offset.x: 036 offset.x: 0
38 offset.y: 037 offset.y: 0
3938
=== modified file 'shell/dash/MultiRangeButton.qml'
--- shell/dash/MultiRangeButton.qml 2011-11-29 17:45:27 +0000
+++ shell/dash/MultiRangeButton.qml 2012-02-24 14:58:01 +0000
@@ -44,7 +44,6 @@
44 elide: Text.ElideRight44 elide: Text.ElideRight
4545
46 effect: DropShadow {46 effect: DropShadow {
47 blurRadius: 8
48 color: "white"47 color: "white"
49 offset.x: 048 offset.x: 0
50 offset.y: 049 offset.y: 0
5150
=== modified file 'shell/dash/Star.qml'
--- shell/dash/Star.qml 2011-11-25 15:44:18 +0000
+++ shell/dash/Star.qml 2012-02-24 14:58:01 +0000
@@ -30,7 +30,6 @@
30 height: childrenRect.height30 height: childrenRect.height
3131
32 effect: DropShadow {32 effect: DropShadow {
33 blurRadius: 8
34 color: "white"33 color: "white"
35 offset.x: 034 offset.x: 0
36 offset.y: 035 offset.y: 0
3736
=== modified file 'shell/dash/TickBox.qml'
--- shell/dash/TickBox.qml 2012-01-10 16:52:24 +0000
+++ shell/dash/TickBox.qml 2012-02-24 14:58:01 +0000
@@ -34,7 +34,6 @@
34 height: childrenRect.height34 height: childrenRect.height
3535
36 effect: DropShadow {36 effect: DropShadow {
37 blurRadius: 8
38 color: "white"37 color: "white"
39 offset.x: 038 offset.x: 0
40 offset.y: 039 offset.y: 0
4140
=== modified file 'shell/launcher/artwork/launcher_pip_ltr.png'
42Binary 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 14:58:01 +0000 differ41Binary 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 14:58:01 +0000 differ

Subscribers

People subscribed via source and target branches