Merge lp:~sil2100/unity/fix-1053047-6.0 into lp:unity/6.0

[Łukasz Zemczak]

Cherry-picked from lp:unity rev 2812:
Use expand icon by default.

Cherry-picked andyrock's fix from trunk:

== Problem ==
Dash - Category expander arrow is in expanded mode no metter if category is actually expanded.

== Test ==
Unit test added.

[Marco Trevisan (Treviño) (3v1n0)]

review: Approve

=== modified file 'dash/LensView.cpp'
--- dash/LensView.cpp	2012-10-03 11:59:50 +0000
+++ dash/LensView.cpp	2012-10-08 16:22:39 +0000
@@ -309,7 +309,7 @@
     if (existing_group->GetCategoryIndex() == index) return;
   }
 
-  PlacesGroup* group = new PlacesGroup();
+  PlacesGroup* group = new PlacesGroup(dash::Style::Instance());
   AddChild(group);
   group->SetName(name);
   group->SetIcon(icon_hint);
 
=== modified file 'dash/PlacesGroup.cpp'
--- dash/PlacesGroup.cpp	2012-09-18 11:55:33 +0000
+++ dash/PlacesGroup.cpp	2012-10-08 16:22:39 +0000
@@ -31,8 +31,6 @@
 #include <UnityCore/GLibWrapper.h>
 
 #include "unity-shared/StaticCairoText.h"
-#include "unity-shared/DashStyle.h"
-#include "unity-shared/LineSeparator.h"
 #include "unity-shared/ubus-server.h"
 #include "unity-shared/UBusMessages.h"
 
@@ -112,8 +110,9 @@
 
 NUX_IMPLEMENT_OBJECT_TYPE(PlacesGroup);
 
-PlacesGroup::PlacesGroup()
+PlacesGroup::PlacesGroup(dash::StyleInterface& style)
   : AbstractPlacesGroup(),
+    _style(style),
     _child_view(nullptr),
     _is_expanded(false),
     _n_visible_items_in_unexpand_mode(0),
@@ -122,15 +121,13 @@
     _coverflow_enabled(false),
     disabled_header_count_(false)
 {
-  dash::Style& style = dash::Style::Instance();
-
   SetAcceptKeyNavFocusOnMouseDown(false);
   SetAcceptKeyNavFocusOnMouseEnter(false);
 
-  nux::BaseTexture* arrow = style.GetGroupUnexpandIcon();
+  nux::BaseTexture* arrow = _style.GetGroupExpandIcon();
   
-  _background = style.GetCategoryBackground();
-  _background_nofilters = style.GetCategoryBackgroundNoFilters();
+  _background = _style.GetCategoryBackground();
+  _background_nofilters = _style.GetCategoryBackgroundNoFilters();
 
   nux::ROPConfig rop;
   rop.Blend = true;
@@ -154,7 +151,7 @@
   _group_layout->AddView(_header_view, 0, nux::MINOR_POSITION_TOP, nux::MINOR_SIZE_FULL);
 
   _header_layout = new nux::HLayout(NUX_TRACKER_LOCATION);
-  _header_layout->SetLeftAndRightPadding(style.GetCategoryHeaderLeftPadding(), 0);
+  _header_layout->SetLeftAndRightPadding(_style.GetCategoryHeaderLeftPadding(), 0);
   _header_layout->SetSpaceBetweenChildren(10);
   _header_view->SetLayout(_header_layout);
 
@@ -449,7 +446,7 @@
   // only the width matters
   if (_cached_geometry.GetWidth() != geo.GetWidth())
   {
-    _focus_layer.reset(dash::Style::Instance().FocusOverlay(geo.width - kHighlightLeftPadding - kHighlightRightPadding, kHighlightHeight));
+    _focus_layer.reset(_style.FocusOverlay(geo.width - kHighlightLeftPadding - kHighlightRightPadding, kHighlightHeight));
     _cached_geometry = geo;
   }
   return ret;
@@ -557,11 +554,10 @@
 
   Refresh();
 
-  dash::Style& style = dash::Style::Instance();
   if (_is_expanded)
-    _expand_icon->SetTexture(style.GetGroupUnexpandIcon());
+    _expand_icon->SetTexture(_style.GetGroupUnexpandIcon());
   else
-    _expand_icon->SetTexture(style.GetGroupExpandIcon());
+    _expand_icon->SetTexture(_style.GetGroupExpandIcon());
 
   expanded.emit(this);
 }
 
=== modified file 'dash/PlacesGroup.h'
--- dash/PlacesGroup.h	2012-09-13 09:15:15 +0000
+++ dash/PlacesGroup.h	2012-10-08 16:22:39 +0000
@@ -27,6 +27,7 @@
 
 #include <sigc++/sigc++.h>
 
+#include "unity-shared/DashStyleInterface.h"
 #include "unity-shared/IconTexture.h"
 #include "unity-shared/Introspectable.h"
 #include "unity-shared/StaticCairoText.h"
@@ -54,7 +55,7 @@
   NUX_DECLARE_OBJECT_TYPE(PlacesGroup, dash::AbstractPlacesGroup);
 public:
 
-  PlacesGroup();
+  PlacesGroup(dash::StyleInterface& style);
 
   void SetIcon(std::string const& icon);
   void SetName(std::string const& name);
@@ -116,6 +117,8 @@
   void RefreshLabel();
 
 private:
+  dash::StyleInterface& _style;
+
   nux::VLayout* _group_layout;
   nux::View* _header_view;
   nux::HLayout* _header_layout;
 
=== modified file 'tests/CMakeLists.txt'
--- tests/CMakeLists.txt	2012-10-01 15:12:05 +0000
+++ tests/CMakeLists.txt	2012-10-08 16:22:39 +0000
@@ -220,6 +220,7 @@
                  test_launcher_icon.cpp
                  test_keyboard_util.cpp
                  test_panel_style.cpp
+                 test_places_group.cpp
                  test_previews_application.cpp
                  test_previews_generic.cpp
                  test_previews_movie.cpp
@@ -246,6 +247,10 @@
                  ${CMAKE_SOURCE_DIR}/dash/DashViewPrivate.cpp
                  ${CMAKE_SOURCE_DIR}/dash/LensViewPrivate.cpp
                  ${CMAKE_SOURCE_DIR}/dash/ResultRenderer.cpp
+                 ${CMAKE_SOURCE_DIR}/dash/PlacesGroup.cpp
+                 ${CMAKE_SOURCE_DIR}/dash/ResultRenderer.cpp
+                 ${CMAKE_SOURCE_DIR}/dash/ResultRendererHorizontalTile.cpp
+                 ${CMAKE_SOURCE_DIR}/dash/ResultRendererTile.cpp
                  ${CMAKE_SOURCE_DIR}/dash/ResultView.cpp
                  ${CMAKE_SOURCE_DIR}/dash/ResultViewGrid.cpp
                  ${CMAKE_SOURCE_DIR}/dash/previews/ActionButton.cpp
 
=== added file 'tests/test_places_group.cpp'
--- tests/test_places_group.cpp	1970-01-01 00:00:00 +0000
+++ tests/test_places_group.cpp	2012-10-08 16:22:39 +0000
@@ -0,0 +1,103 @@
+/*
+ * Copyright 2012 Canonical Ltd.
+ *
+ * This program is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 3, as published
+ * by the  Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranties of
+ * MERCHANTABILITY, SATISFACTORY QUALITY or FITNESS FOR A PARTICULAR
+ * PURPOSE.  See the GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * version 3 along with this program.  If not, see
+ * <http://www.gnu.org/licenses/>
+ *
+ * Authored by: Andrea Azzarone <[e-mail]>
+ *
+ */
+
+#include "config.h"
+#include <gmock/gmock.h>
+using namespace testing;
+
+#include <Nux/Nux.h>
+#include <Nux/PaintLayer.h>
+
+#include "PlacesGroup.h"
+using namespace unity;
+
+namespace {
+
+class MockDashStyle : public dash::StyleInterface
+{
+public:
+  MockDashStyle()
+  {
+    std::string full_path = PKGDATADIR "album_missing.png";
+    glib::Object<GdkPixbuf> pixbuf(gdk_pixbuf_new_from_file_at_size(full_path.c_str(), 20, 20, nullptr));
+    base_texture_.Adopt(nux::CreateTexture2DFromPixbuf(pixbuf, true));
+  }
+
+  MOCK_METHOD2(FocusOverlay, nux::AbstractPaintLayer*(int width, int height));
+  MOCK_METHOD0(GetCategoryBackground, nux::BaseTexture*());
+  MOCK_METHOD0(GetCategoryBackgroundNoFilters, nux::BaseTexture*());
+
+  MOCK_METHOD0(GetGroupExpandIcon, nux::BaseTexture*());
+  MOCK_METHOD0(GetGroupUnexpandIcon, nux::BaseTexture*());
+
+  MOCK_CONST_METHOD0(GetCategoryHeaderLeftPadding, int());
+  MOCK_CONST_METHOD0(GetPlacesGroupTopSpace, int());
+
+  nux::ObjectPtr<nux::BaseTexture> base_texture_;
+};
+
+
+class TestPlacesGroup : public Test
+{
+public:
+  void SetUp()
+  {
+    SetupMockDashStyle();
+
+    places_group_ = new PlacesGroup(dash_style_);
+  }
+
+  void SetupMockDashStyle()
+  {
+    ON_CALL(dash_style_, FocusOverlay(_, _))
+      .WillByDefault(Return(new nux::ColorLayer(nux::color::White)));
+
+    ON_CALL(dash_style_, GetCategoryBackground())
+      .WillByDefault(Return(dash_style_.base_texture_.GetPointer()));
+
+    ON_CALL(dash_style_, GetCategoryBackgroundNoFilters())
+      .WillByDefault(Return(dash_style_.base_texture_.GetPointer()));
+
+    ON_CALL(dash_style_, GetGroupExpandIcon())
+      .WillByDefault(Return(dash_style_.base_texture_.GetPointer()));
+
+    ON_CALL(dash_style_, GetGroupUnexpandIcon())
+         .WillByDefault(Return(dash_style_.base_texture_.GetPointer()));
+  }
+
+  NiceMock<MockDashStyle> dash_style_;
+  nux::ObjectPtr<PlacesGroup> places_group_;
+};
+
+
+TEST_F(TestPlacesGroup, Constructor)
+{
+  EXPECT_CALL(dash_style_, GetGroupExpandIcon())
+    .Times(1);
+
+  EXPECT_CALL(dash_style_, GetGroupUnexpandIcon())
+      .Times(0);
+
+  PlacesGroup places_group(dash_style_);
+
+  EXPECT_FALSE(places_group.GetExpanded());
+}
+
+}
 
=== modified file 'unity-shared/DashStyle.h'
--- unity-shared/DashStyle.h	2012-10-01 15:12:05 +0000
+++ unity-shared/DashStyle.h	2012-10-08 16:22:39 +0000
@@ -20,6 +20,8 @@
 #ifndef DASH_STYLE_H
 #define DASH_STYLE_H
 
+#include "DashStyleInterface.h"
+
 #include <Nux/Nux.h>
 #include <Nux/View.h>
 #include <Nux/AbstractButton.h>
@@ -83,7 +85,7 @@
 };
 
 
-class Style
+class Style : public StyleInterface
 {
 public:
   Style ();
 
=== added file 'unity-shared/DashStyleInterface.h'
--- unity-shared/DashStyleInterface.h	1970-01-01 00:00:00 +0000
+++ unity-shared/DashStyleInterface.h	2012-10-08 16:22:39 +0000
@@ -0,0 +1,53 @@
+// -*- Mode: C++; indent-tabs-mode: nil; tab-width: 2 -*-
+/*
+ * Copyright (C) 2012 Canonical Ltd
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 3 as
+ * published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * Authored by: Andrea Azzarone <[e-mail]>
+ */
+
+#ifndef UNITYSHELL_DASH_STYLE_INTERFACE_H
+#define UNITYSHELL_DASH_STYLE_INTERFACE_H
+
+#include <memory>
+
+namespace nux {
+  class AbstractPaintLayer;
+  class BaseTexture;
+}
+
+namespace unity {
+namespace dash {
+
+class StyleInterface
+{
+public:
+  virtual ~StyleInterface() {};
+
+  virtual nux::AbstractPaintLayer* FocusOverlay(int width, int height) = 0;
+
+  virtual nux::BaseTexture* GetCategoryBackground() = 0;
+  virtual nux::BaseTexture* GetCategoryBackgroundNoFilters() = 0;
+
+  virtual nux::BaseTexture* GetGroupUnexpandIcon() = 0;
+  virtual nux::BaseTexture* GetGroupExpandIcon() = 0;
+
+  virtual int GetCategoryHeaderLeftPadding() const = 0;
+  virtual int GetPlacesGroupTopSpace() const = 0;
+};
+
+}
+}
+
+#endif