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 (community) 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
=== modified file 'places/HomeButton.qml'
--- places/HomeButton.qml 2011-06-23 17:08:53 +0000
+++ places/HomeButton.qml 2011-08-23 15:49:44 +0000
@@ -60,7 +60,6 @@
60 anchors.rightMargin: 560 anchors.rightMargin: 5
61 anchors.leftMargin: 761 anchors.leftMargin: 7
62 height: 4062 height: 40
63 font.underline: parent.activeFocus
64 font.bold: true63 font.bold: true
65 font.pixelSize: 1664 font.pixelSize: 16
66 }65 }
6766
=== modified file 'places/UnityDefaultRenderer.qml'
--- places/UnityDefaultRenderer.qml 2011-08-09 16:18:45 +0000
+++ places/UnityDefaultRenderer.qml 2011-08-23 15:49:44 +0000
@@ -20,10 +20,10 @@
20import Unity2d 1.0 /* required for drag’n’drop handling */20import Unity2d 1.0 /* required for drag’n’drop handling */
2121
22RendererGrid {22RendererGrid {
23 cellWidth: 13623 cellWidth: 100
24 cellHeight: 10824 cellHeight: 108
25 horizontalSpacing: 1025 horizontalSpacing: 46
26 verticalSpacing: 1026 verticalSpacing: 20
2727
28 cellRenderer: Component {28 cellRenderer: Component {
29 Button {29 Button {
@@ -70,11 +70,10 @@
70 id: icon70 id: icon
7171
72 source: iconHint != "" ? "image://icons/"+iconHint : ""72 source: iconHint != "" ? "image://icons/"+iconHint : ""
73 width: 4873 width: 64
74 height: 4874 height: 64
75 anchors.horizontalCenter: parent.horizontalCenter75 anchors.horizontalCenter: parent.horizontalCenter
76 anchors.top: parent.top76 anchors.top: parent.top
77 anchors.topMargin: 10
78 fillMode: Image.PreserveAspectFit77 fillMode: Image.PreserveAspectFit
79 sourceSize.width: width78 sourceSize.width: width
80 sourceSize.height: height79 sourceSize.height: height
@@ -96,10 +95,8 @@
96 anchors.right: parent.right95 anchors.right: parent.right
97 anchors.left: parent.left96 anchors.left: parent.left
98 anchors.topMargin: 1097 anchors.topMargin: 10
99 anchors.bottomMargin: 5
100 anchors.rightMargin: 398 anchors.rightMargin: 3
101 anchors.leftMargin: 399 anchors.leftMargin: 3
102 font.underline: parent.activeFocus
103 }100 }
104 }101 }
105 }102 }

Subscribers

People subscribed via source and target branches