=== modified file 'dash/LensBar.cpp'
--- dash/LensBar.cpp 2012-08-09 14:28:50 +0000
+++ dash/LensBar.cpp 2012-09-12 10:02:20 +0000
@@ -31,7 +31,9 @@
nux::logging::Logger logger("unity.dash.lensbar");
-const int LENSBAR_HEIGHT = 44;
+// according to Q design the inner area of the lensbar should be 40px
+// (without any borders)
+const int LENSBAR_HEIGHT = 41;
}
=== modified file 'dash/PlacesGroup.cpp'
--- dash/PlacesGroup.cpp 2012-08-20 16:49:10 +0000
+++ dash/PlacesGroup.cpp 2012-09-12 10:02:20 +0000
@@ -58,6 +58,7 @@
const nux::Color kExpandDefaultTextColor(1.0f, 1.0f, 1.0f, 0.5f);
const float kExpandDefaultIconOpacity = 0.5f;
+const int kCategoryIconSize = 22;
// Category highlight
const int kHighlightHeight = 24;
const int kHighlightRightPadding = 10 - 3; // -3 because the scrollbar is not a real overlay scrollbar!
@@ -142,8 +143,8 @@
_header_layout->SetSpaceBetweenChildren(10);
_header_view->SetLayout(_header_layout);
- _icon = new IconTexture("", 24);
- _icon->SetMinMaxSize(24, 24);
+ _icon = new IconTexture("", kCategoryIconSize);
+ _icon->SetMinMaxSize(kCategoryIconSize, kCategoryIconSize);
_header_layout->AddView(_icon, 0, nux::MINOR_POSITION_CENTER, nux::MINOR_SIZE_FIX);
_text_layout = new nux::HLayout(NUX_TRACKER_LOCATION);
@@ -277,7 +278,7 @@
void
PlacesGroup::SetIcon(std::string const& path_to_emblem)
{
- _icon->SetByIconName(path_to_emblem, 24);
+ _icon->SetByIconName(path_to_emblem, kCategoryIconSize);
}
void
=== modified file 'dash/previews/ActionButton.cpp'
--- dash/previews/ActionButton.cpp 2012-08-28 08:30:00 +0000
+++ dash/previews/ActionButton.cpp 2012-09-12 10:02:20 +0000
@@ -29,7 +29,7 @@
namespace
{
-const int kMinButtonHeight = 36;
+const int kMinButtonHeight = 34;
const int kMinButtonWidth = 48;
const int icon_size = 24;
=== modified file 'plugins/unityshell/resources/lens-nav-app.svg'
--- plugins/unityshell/resources/lens-nav-app.svg 2011-06-30 17:24:25 +0000
+++ plugins/unityshell/resources/lens-nav-app.svg 2012-09-12 10:02:20 +0000
@@ -1,17 +1,17 @@
-
+
-
\ No newline at end of file
=== modified file 'plugins/unityshell/resources/lens-nav-file.svg'
--- plugins/unityshell/resources/lens-nav-file.svg 2011-06-30 17:24:25 +0000
+++ plugins/unityshell/resources/lens-nav-file.svg 2012-09-12 10:02:20 +0000
@@ -1,13 +1,8 @@
-
+
-
\ No newline at end of file
=== added file 'plugins/unityshell/resources/lens-nav-gwibber.svg'
--- plugins/unityshell/resources/lens-nav-gwibber.svg 1970-01-01 00:00:00 +0000
+++ plugins/unityshell/resources/lens-nav-gwibber.svg 2012-09-12 10:02:20 +0000
@@ -0,0 +1,14 @@
+
+
+
+
=== modified file 'plugins/unityshell/resources/lens-nav-home.svg'
--- plugins/unityshell/resources/lens-nav-home.svg 2011-06-30 17:24:25 +0000
+++ plugins/unityshell/resources/lens-nav-home.svg 2012-09-12 10:02:20 +0000
@@ -1,9 +1,9 @@
-
+
-
\ No newline at end of file
=== modified file 'plugins/unityshell/resources/lens-nav-music.svg'
--- plugins/unityshell/resources/lens-nav-music.svg 2011-06-30 17:24:25 +0000
+++ plugins/unityshell/resources/lens-nav-music.svg 2012-09-12 10:02:20 +0000
@@ -1,16 +1,11 @@
-
+
-
\ No newline at end of file
=== modified file 'plugins/unityshell/resources/lens-nav-photo.svg'
--- plugins/unityshell/resources/lens-nav-photo.svg 2011-06-30 17:24:25 +0000
+++ plugins/unityshell/resources/lens-nav-photo.svg 2012-09-12 10:02:20 +0000
@@ -1,16 +1,11 @@
-
+
-
\ No newline at end of file
=== modified file 'plugins/unityshell/resources/lens-nav-video.svg'
--- plugins/unityshell/resources/lens-nav-video.svg 2011-06-30 17:24:25 +0000
+++ plugins/unityshell/resources/lens-nav-video.svg 2012-09-12 10:02:20 +0000
@@ -1,14 +1,13 @@
-
+
-
\ No newline at end of file
=== modified file 'unity-shared/PreviewStyle.cpp'
--- unity-shared/PreviewStyle.cpp 2012-09-06 07:03:54 +0000
+++ unity-shared/PreviewStyle.cpp 2012-09-12 10:02:20 +0000
@@ -224,7 +224,7 @@
int Style::GetActionButtonHeight() const
{
- return 36;
+ return 34;
}
int Style::GetActionButtonMaximumWidth() const