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

Proposed by Florian Boucault on 2011-08-23
Status: Merged
Approved by: Gerry Boland on 2011-08-23
Approved revision: 679
Merged at revision: 681
Proposed branch: lp:~fboucault/unity-2d/dash_bigger_icons
Merge into: lp:unity-2d/3.0
Diff against target: 54 lines (+5/-9)
2 files modified
places/HomeButton.qml (+0/-1)
places/UnityDefaultRenderer.qml (+5/-8)
To merge this branch: bzr merge lp:~fboucault/unity-2d/dash_bigger_icons
Reviewer Review Type Date Requested Status
Gerry Boland 2011-08-23 Approve on 2011-08-23
Review via email: mp+72540@code.launchpad.net

Description of the change

[dash] Icons are now of size 64x64 instead of 48x48.

To post a comment you must log in.
Gerry Boland (gerboland) wrote :

Icons are bigger yes, but you'll need to increase the vertical size of each grid entry to allow 2 lines of text to be visible underneath each icon.

With this commit, only one line of text is visible. When you mouse over, you see the rest.

review: Needs Fixing
679. By Florian Boucault on 2011-08-23

Adapted layout for new icon size. Removed label underline upon keyboard focus. Reverted change on places/UnityFileInfoRenderer.qml.

Gerry Boland (gerboland) wrote :

Ok, that's better. Accepted

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'places/HomeButton.qml'
2--- places/HomeButton.qml 2011-06-23 17:08:53 +0000
3+++ places/HomeButton.qml 2011-08-23 15:49:44 +0000
4@@ -60,7 +60,6 @@
5 anchors.rightMargin: 5
6 anchors.leftMargin: 7
7 height: 40
8- font.underline: parent.activeFocus
9 font.bold: true
10 font.pixelSize: 16
11 }
12
13=== modified file 'places/UnityDefaultRenderer.qml'
14--- places/UnityDefaultRenderer.qml 2011-08-09 16:18:45 +0000
15+++ places/UnityDefaultRenderer.qml 2011-08-23 15:49:44 +0000
16@@ -20,10 +20,10 @@
17 import Unity2d 1.0 /* required for drag’n’drop handling */
18
19 RendererGrid {
20- cellWidth: 136
21+ cellWidth: 100
22 cellHeight: 108
23- horizontalSpacing: 10
24- verticalSpacing: 10
25+ horizontalSpacing: 46
26+ verticalSpacing: 20
27
28 cellRenderer: Component {
29 Button {
30@@ -70,11 +70,10 @@
31 id: icon
32
33 source: iconHint != "" ? "image://icons/"+iconHint : ""
34- width: 48
35- height: 48
36+ width: 64
37+ height: 64
38 anchors.horizontalCenter: parent.horizontalCenter
39 anchors.top: parent.top
40- anchors.topMargin: 10
41 fillMode: Image.PreserveAspectFit
42 sourceSize.width: width
43 sourceSize.height: height
44@@ -96,10 +95,8 @@
45 anchors.right: parent.right
46 anchors.left: parent.left
47 anchors.topMargin: 10
48- anchors.bottomMargin: 5
49 anchors.rightMargin: 3
50 anchors.leftMargin: 3
51- font.underline: parent.activeFocus
52 }
53 }
54 }

Subscribers

People subscribed via source and target branches