Unity

Merge lp:~gordallott/unity/design-spacing-changes into lp:unity

  1. design-spacing-changes
  2. Merge into trunk
Proposed by Gord Allott
Status: Merged
Approved by: Gord Allott
Approved revision: no longer in the source branch.
Merged at revision: 2693
Proposed branch: lp:~gordallott/unity/design-spacing-changes
Merge into: lp:unity
Diff against target: 75 lines (+7/-7)
5 files modified
dash/DashView.cpp (+1/-1)
dash/FilterExpanderLabel.cpp (+1/-1)
dash/PlacesGroup.cpp (+1/-1)
unity-shared/DashStyle.cpp (+3/-3)
unity-shared/SearchBar.cpp (+1/-1)
To merge this branch: bzr merge lp:~gordallott/unity/design-spacing-changes
Reviewer Review Type Date Requested Status
Gord Allott (community) Approve
Review via email: mp+124472@code.launchpad.net

Commit message

some changes in spacing from new designs

Description of the change

some changes in spacing from new designs

To post a comment you must log in.
Revision history for this message
Gord Allott (gordallott) wrote :

approving so its merged in, +1 from johnlea, just value changes

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'dash/DashView.cpp'
2--- dash/DashView.cpp 2012-09-07 17:36:50 +0000
3+++ dash/DashView.cpp 2012-09-14 17:08:19 +0000
4@@ -382,7 +382,7 @@
5
6 height = search_bar_->GetGeometry().height;
7 height += tile_height * 3;
8- height += (style.GetPlacesGroupTopSpace() - 2 + 24 + 8) * 3; // adding three group headers
9+ height += (style.GetPlacesGroupTopSpace() - 2 + 24 + 2) * 3; // adding three group headers
10 height += 1*2; // hseparator height
11 height += style.GetDashViewTopPadding();
12 height += lens_bar_->GetGeometry().height;
13
14=== modified file 'dash/FilterExpanderLabel.cpp'
15--- dash/FilterExpanderLabel.cpp 2012-07-25 20:08:22 +0000
16+++ dash/FilterExpanderLabel.cpp 2012-09-14 17:08:19 +0000
17@@ -33,7 +33,7 @@
18 const int EXPANDER_LAYOUT_SPACE_BETWEEN_CHILDREN = 8;
19
20 // font
21-const char* const FONT_EXPANDER_LABEL = "Ubuntu Bold 13"; // 17px = 13
22+const char* const FONT_EXPANDER_LABEL = "Ubuntu 13"; // 17px = 13
23
24 class ExpanderView : public nux::View
25 {
26
27=== modified file 'dash/PlacesGroup.cpp'
28--- dash/PlacesGroup.cpp 2012-09-14 10:56:00 +0000
29+++ dash/PlacesGroup.cpp 2012-09-14 17:08:19 +0000
30@@ -330,7 +330,7 @@
31 layout->AddView(_child_view, 0);
32
33 layout->SetLeftAndRightPadding(25, 0);
34- _group_layout->AddLayout(new nux::SpaceLayout(8,8,8,8), 0); // top padding
35+ _group_layout->AddLayout(new nux::SpaceLayout(2,2,2,2), 0); // top padding
36 _group_layout->AddLayout(layout, 1);
37
38 view->results_per_row.changed.connect([&] (int results_per_row)
39
40=== modified file 'unity-shared/DashStyle.cpp'
41--- unity-shared/DashStyle.cpp 2012-09-14 14:59:09 +0000
42+++ unity-shared/DashStyle.cpp 2012-09-14 17:08:19 +0000
43@@ -2073,8 +2073,8 @@
44
45 int Style::GetTileHeight() const
46 {
47- return std::max(GetTileImageSize() + (pimpl->text_height_ * 2) + 10,
48- GetTileImageSize() + 50 + 18); // magic design numbers.
49+ return std::max(GetTileImageSize() + (pimpl->text_height_ * 2) + 15,
50+ GetTileImageSize() + 32); // magic design numbers.
51 }
52
53 int Style::GetTileIconHightlightHeight() const
54@@ -2367,7 +2367,7 @@
55
56 int Style::GetPlacesGroupTopSpace() const
57 {
58- return 15;
59+ return 7;
60 }
61
62 int Style::GetCategoryHeaderLeftPadding() const
63
64=== modified file 'unity-shared/SearchBar.cpp'
65--- unity-shared/SearchBar.cpp 2012-08-15 17:22:33 +0000
66+++ unity-shared/SearchBar.cpp 2012-09-14 17:08:19 +0000
67@@ -54,7 +54,7 @@
68 const int PANGO_ENTRY_FONT_SIZE = 22;
69
70 const std::string SHOW_FILTERS_LABEL_FONT_SIZE = "13";
71-const std::string SHOW_FILTERS_LABEL_FONT_STYLE = "Bold";
72+const std::string SHOW_FILTERS_LABEL_FONT_STYLE = "";
73 const std::string SHOW_FILTERS_LABEL_DEFAULT_FONT = "Ubuntu " + SHOW_FILTERS_LABEL_FONT_STYLE + " " + SHOW_FILTERS_LABEL_FONT_SIZE;
74
75 }