Merge lp:~3v1n0/unity/fix-panel-redraw-no-menus into lp:unity

[Marco Trevisan (Treviño)]

PanelMenuView: force a queuedraw when the buttons opacity changes

The panel needs to be redrawn when the buttons opacity changes... Easy fix, nice new test :)

[Brandon Schaefer (brandontschaefer)]

Cool works here.

review: Approve

=== modified file 'panel/PanelMenuView.cpp'
--- panel/PanelMenuView.cpp	2012-12-14 16:53:00 +0000
+++ panel/PanelMenuView.cpp	2012-12-14 16:53:00 +0000
@@ -105,6 +105,8 @@
 
   window_buttons_->mouse_enter.connect(sigc::mem_fun(this, &PanelMenuView::OnPanelViewMouseEnter));
   window_buttons_->mouse_leave.connect(sigc::mem_fun(this, &PanelMenuView::OnPanelViewMouseLeave));
+  /* This is needed since when buttons are redrawn, the panel is not. See bug #1090439 */
+  window_buttons_->opacity.changed.connect(sigc::hide(sigc::mem_fun(this, &PanelMenuView::QueueDraw)));
   AddChild(window_buttons_.GetPointer());
 
   layout_->SetLeftAndRightPadding(window_buttons_->GetContentWidth(), 0);

=== modified file 'tests/test_panel_menu_view.cpp'
--- tests/test_panel_menu_view.cpp	2012-12-14 16:53:00 +0000
+++ tests/test_panel_menu_view.cpp	2012-12-14 16:53:00 +0000
@@ -31,15 +31,6 @@
 namespace unity
 {
 
-class MockPanelMenuView : public PanelMenuView
-{
-  protected:
-    virtual std::string GetActiveViewName(bool use_appname) const
-    {
-      return "<>'";
-    }
-};
-
 struct TestPanelMenuView : public testing::Test
 {
   void ProcessUBusMessages()
@@ -50,24 +41,28 @@
     Utils::WaitUntil(expired);
   }
 
-  std::string panelTitle() const
+  struct MockPanelMenuView : public PanelMenuView
   {
-    const PanelMenuView *panel = &panelMenuView;
-    return panel->GetCurrentTitle();
-  }
-
-private:
-  // The order is important, i.e. PanelMenuView needs
+    MOCK_METHOD0(QueueDraw, void());
+    MOCK_CONST_METHOD1(GetActiveViewName, std::string(bool));
+
+    using PanelMenuView::window_buttons_;
+    using PanelMenuView::GetCurrentTitle;
+  };
+
+protected:
+  // The order is important, i.e. menu_view needs
   // panel::Style that needs Settings
   Settings settings;
   panel::Style panelStyle;
-  MockPanelMenuView panelMenuView;
+  testing::NiceMock<MockPanelMenuView> menu_view;
 };
 
 TEST_F(TestPanelMenuView, Escaping)
 {
+  ON_CALL(menu_view, GetActiveViewName(testing::_)).WillByDefault(Return("<>'"));
   static const char *escapedText = "Panel d&amp;Inici";
-  EXPECT_TRUE(panelTitle().empty());
+  EXPECT_TRUE(menu_view.GetCurrentTitle().empty());
 
   UBusManager ubus;
   ubus.SendMessage(UBUS_LAUNCHER_START_KEY_NAV, NULL);
@@ -75,18 +70,24 @@
                    g_variant_new_string(escapedText));
   ProcessUBusMessages();
 
-  EXPECT_EQ(panelTitle(), escapedText);
+  EXPECT_EQ(menu_view.GetCurrentTitle(), escapedText);
 
   ubus.SendMessage(UBUS_LAUNCHER_END_KEY_NAV, NULL);
   ProcessUBusMessages();
 
   StandaloneWindowManager *wm = dynamic_cast<StandaloneWindowManager *>(&WindowManager::Default());
   ASSERT_NE(wm, nullptr);
-  // Change the wm to trick PanelMenuView::RefreshTitle to call GetActiveViewName
+  // Change the wm to trick menu_view::RefreshTitle to call GetActiveViewName
   wm->SetScaleActive(true);
   wm->SetScaleActiveForGroup(true);
 
-  EXPECT_EQ(panelTitle(), "&lt;&gt;&apos;");
+  EXPECT_EQ(menu_view.GetCurrentTitle(), "&lt;&gt;&apos;");
+}
+
+TEST_F(TestPanelMenuView, QueuesDrawOnButtonsOpacityChange)
+{
+  EXPECT_CALL(menu_view, QueueDraw());
+  menu_view.window_buttons_->opacity.changed.emit(0.5f);
 }
 
 }