Merge lp:~3v1n0/unity/panel-grab-offset-fix into lp:unity

[Marco Trevisan (Treviño)]

PanelMenuView: restore a grabbed window taking care of the panel offset

Take care of the offset of the panel when defining the new geometry of a restored window by mouse grabbing.

Added tests... (a nice example - considering that this needed lp:~3v1n0/unity/standalone-wm-properties as well - how to generate hundreds of lines of diffs, just for testing an one-line-change ;-) )

[Andrea Azzarone (azzar1)]

Fix the problems here. All the tests pass.

review: Approve

=== modified file 'panel/PanelMenuView.cpp'
--- panel/PanelMenuView.cpp	2013-01-28 23:57:38 +0000
+++ panel/PanelMenuView.cpp	2013-01-29 14:50:27 +0000
@@ -155,7 +155,6 @@
   titlebar_grab_area_->mouse_leave.connect(sigc::mem_fun(this, &PanelMenuView::OnPanelViewMouseLeave));
 
   ubus_manager_.RegisterInterest(UBUS_SWITCHER_SHOWN, sigc::mem_fun(this, &PanelMenuView::OnSwitcherShown));
-
   ubus_manager_.RegisterInterest(UBUS_LAUNCHER_START_KEY_NAV, sigc::mem_fun(this, &PanelMenuView::OnLauncherKeyNavStarted));
   ubus_manager_.RegisterInterest(UBUS_LAUNCHER_END_KEY_NAV, sigc::mem_fun(this, &PanelMenuView::OnLauncherKeyNavEnded));
   ubus_manager_.RegisterInterest(UBUS_LAUNCHER_START_KEY_SWITCHER, sigc::mem_fun(this, &PanelMenuView::OnLauncherKeyNavStarted));
@@ -1414,7 +1413,7 @@
 
 void PanelMenuView::OnMaximizedGrabMove(int x, int y)
 {
-  auto panel = static_cast<nux::BaseWindow*>(GetTopLevelViewWindow());
+  auto panel = GetTopLevelViewWindow();
 
   if (!panel)
     return;
@@ -1429,7 +1428,7 @@
    *
    * This is a workaround to avoid that the grid plugin would be fired
    * showing the window shape preview effect. See bug #838923 */
-  if (maximized != 0 && panel)
+  if (maximized != 0)
   {
     nux::Geometry const& panel_geo = panel->GetAbsoluteGeometry();
 
@@ -1443,7 +1442,7 @@
        * pointer position, if it doesn't fit on that area try to keep it into the
        * current workarea as much as possible, but giving priority to the left border
        * that shouldn't be never put out of the workarea */
-      int restore_x = x - (restored_geo.width * x / panel_geo.width);
+      int restore_x = x - (restored_geo.width * (x - panel_geo.x) / panel_geo.width);
       int restore_y = y;
 
       if (restore_x + restored_geo.width > workarea_geo.x + workarea_geo.width)

=== modified file 'tests/test_panel_menu_view.cpp'
--- tests/test_panel_menu_view.cpp	2012-12-14 16:44:58 +0000
+++ tests/test_panel_menu_view.cpp	2013-01-29 14:50:27 +0000
@@ -24,6 +24,7 @@
 #include "UnitySettings.h"
 #include "UBusMessages.h"
 #include "StandaloneWindowManager.h"
+#include "test_uscreen_mock.h"
 #include "test_utils.h"
 
 using namespace testing;
@@ -33,28 +34,45 @@
 
 struct TestPanelMenuView : public testing::Test
 {
-  void ProcessUBusMessages()
-  {
-    bool expired = false;
-    glib::Idle idle([&] { expired = true; return false; },
-                    glib::Source::Priority::LOW);
-    Utils::WaitUntil(expired);
-  }
+  TestPanelMenuView()
+    : WM(dynamic_cast<StandaloneWindowManager*>(&WindowManager::Default()))
+  {}
 
   struct MockPanelMenuView : public PanelMenuView
   {
     MOCK_METHOD0(QueueDraw, void());
     MOCK_CONST_METHOD1(GetActiveViewName, std::string(bool));
 
+    using PanelMenuView::GetCurrentTitle;
     using PanelMenuView::window_buttons_;
-    using PanelMenuView::GetCurrentTitle;
+    using PanelMenuView::titlebar_grab_area_;
   };
 
+  nux::ObjectPtr<nux::BaseWindow> AddPanelToWindow(int monitor)
+  {
+    nux::ObjectPtr<nux::BaseWindow> panel_win(new nux::BaseWindow());
+    auto const& monitor_geo = uscreen.GetMonitorGeometry(monitor);
+    panel_win->SetGeometry(monitor_geo);
+    panel_win->SetMaximumHeight(panelStyle.panel_height());
+    panel_win->SetLayout(new nux::HLayout(NUX_TRACKER_LOCATION));
+    panel_win->GetLayout()->AddView(&menu_view, 1);
+    panel_win->GetLayout()->SetContentDistribution(nux::MAJOR_POSITION_START);
+    panel_win->GetLayout()->SetVerticalExternalMargin(0);
+    panel_win->GetLayout()->SetHorizontalExternalMargin(0);
+    panel_win->ComputeContentSize();
+
+    menu_view.SetMonitor(monitor);
+
+    return panel_win;
+  }
+
 protected:
   // The order is important, i.e. menu_view needs
   // panel::Style that needs Settings
+  MockUScreen uscreen;
   Settings settings;
   panel::Style panelStyle;
+  StandaloneWindowManager* WM;
   testing::NiceMock<MockPanelMenuView> menu_view;
 };
 
@@ -65,23 +83,16 @@
   EXPECT_TRUE(menu_view.GetCurrentTitle().empty());
 
   UBusManager ubus;
-  ubus.SendMessage(UBUS_LAUNCHER_START_KEY_NAV, NULL);
+  ubus.SendMessage(UBUS_LAUNCHER_START_KEY_NAV);
   ubus.SendMessage(UBUS_LAUNCHER_SELECTION_CHANGED,
                    g_variant_new_string(escapedText));
-  ProcessUBusMessages();
-
-  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 menu_view::RefreshTitle to call GetActiveViewName
-  wm->SetScaleActive(true);
-  wm->SetScaleActiveForGroup(true);
-
-  EXPECT_EQ(menu_view.GetCurrentTitle(), "&lt;&gt;&apos;");
+  Utils::WaitUntilMSec([this] {return menu_view.GetCurrentTitle() == escapedText;});
+
+
+  WM->SetScaleActive(true);
+  WM->SetScaleActiveForGroup(true);
+  ubus.SendMessage(UBUS_LAUNCHER_END_KEY_NAV);
+  Utils::WaitUntilMSec([this] {return menu_view.GetCurrentTitle() == "&lt;&gt;&apos;";});
 }
 
 TEST_F(TestPanelMenuView, QueuesDrawOnButtonsOpacityChange)
@@ -90,4 +101,44 @@
   menu_view.window_buttons_->opacity.changed.emit(0.5f);
 }
 
+struct ProgressTester : TestPanelMenuView, WithParamInterface<double> {};
+INSTANTIATE_TEST_CASE_P(TestPanelMenuView, ProgressTester, Range(0.0, 1.0, 0.1));
+
+TEST_P(ProgressTester, RestoreOnGrabInBiggerWorkArea)
+{
+  uscreen.SetupFakeMultiMonitor();
+  unsigned monitor = uscreen.GetMonitors().size() - 1;
+  auto const& monitor_geo = uscreen.GetMonitorGeometry(monitor);
+  WM->SetWorkareaGeometry(monitor_geo);
+
+  auto panel_win = AddPanelToWindow(monitor);
+
+  auto max_window = std::make_shared<StandaloneWindow>(g_random_int());
+  WM->AddStandaloneWindow(max_window);
+
+  max_window->maximized = true;
+  nux::Geometry win_geo(monitor_geo.x + monitor_geo.width/4, monitor_geo.y + monitor_geo.height/4,
+                        monitor_geo.width/2, monitor_geo.height/2);
+  max_window->geo = win_geo;
+
+  bool restored = false;
+  bool moved = false;
+  WM->window_restored.connect([&] (Window xid) {restored = (max_window->Xid() == xid);});
+  WM->window_moved.connect([&] (Window xid) {moved = (max_window->Xid() == xid);});
+
+  // Grab the window outside the panel shape
+  nux::Point mouse_pos(panel_win->GetX() + panel_win->GetWidth() * GetParam(), panel_win->GetY() + panel_win->GetHeight() + 1);
+  menu_view.titlebar_grab_area_->grab_move(mouse_pos.x - panel_win->GetX(), mouse_pos.y - panel_win->GetY());
+
+  nux::Geometry expected_geo(win_geo);
+  expected_geo.SetPosition(mouse_pos.x - (win_geo.width * (mouse_pos.x - panel_win->GetX()) / panel_win->GetWidth()), mouse_pos.y);
+  expected_geo.x = std::max<int>(expected_geo.x, monitor_geo.x);
+
+  EXPECT_TRUE(restored);
+  EXPECT_TRUE(moved);
+  EXPECT_FALSE(max_window->maximized());
+  EXPECT_EQ(max_window->geo(), expected_geo);
+}
+
+
 }

=== modified file 'unity-shared/StandaloneWindowManager.cpp'
--- unity-shared/StandaloneWindowManager.cpp	2013-01-25 21:06:34 +0000
+++ unity-shared/StandaloneWindowManager.cpp	2013-01-29 14:50:27 +0000
@@ -245,8 +245,10 @@
 
 void StandaloneWindowManager::RestoreAt(Window window_id, int x, int y)
 {
+  nux::Geometry new_geo = GetWindowGeometry(window_id);
+  new_geo.SetPosition(x, y);
   Restore(window_id);
-  StartMove(window_id, x, y);
+  MoveResizeWindow(window_id, new_geo);
 }
 
 void StandaloneWindowManager::UnMinimize(Window window_id)
@@ -372,13 +374,8 @@
 
 void StandaloneWindowManager::StartMove(Window window_id, int x, int y)
 {
-  auto it = standalone_windows_.find(window_id);
-  if (it != standalone_windows_.end())
-  {
-    nux::Geometry new_geo(it->second->geo());
-    new_geo.SetPosition(x, y);
-    it->second->geo = new_geo;
-  }
+  // This is called when we ask the WM to start the movement of a window,
+  // but it does not actually move it.
 }
 
 int StandaloneWindowManager::GetWindowMonitor(Window window_id) const
@@ -415,8 +412,12 @@
 
 nux::Geometry StandaloneWindowManager::GetWorkAreaGeometry(Window window_id) const
 {
-  nux::Geometry geo(0, 0, 1, 1);
-  return geo;
+  return workarea_geo_;
+}
+
+void StandaloneWindowManager::SetWorkareaGeometry(nux::Geometry const& geo)
+{
+  workarea_geo_ = geo;
 }
 
 nux::Size StandaloneWindowManager::GetWindowDecorationSize(Window window_id, WindowManager::Edge edge) const
@@ -504,9 +505,6 @@
   if (!window)
     return;
 
-  if (standalone_windows_.empty())
-    window->active = true;
-
   auto xid = window->Xid();
   standalone_windows_[xid] = window;
 

=== modified file 'unity-shared/StandaloneWindowManager.h'
--- unity-shared/StandaloneWindowManager.h	2013-01-25 21:06:34 +0000
+++ unity-shared/StandaloneWindowManager.h	2013-01-29 14:50:27 +0000
@@ -143,15 +143,16 @@
   virtual std::string GetWindowName(Window window_id) const;
 
   // Mock functions
+  void AddStandaloneWindow(StandaloneWindow::Ptr const& window);
+  std::map<Window, StandaloneWindow::Ptr> GetStandaloneWindows() const;
+
   void SetScaleActive(bool scale_active);
   void SetScaleActiveForGroup(bool scale_active_for_group);
   void SetCurrentDesktop(unsigned desktop_id);
+
   void SetViewportSize(unsigned horizontal, unsigned vertical);
-
-  void AddStandaloneWindow(StandaloneWindow::Ptr const& window);
-  std::map<Window, StandaloneWindow::Ptr> GetStandaloneWindows() const;
-
   void SetCurrentViewport(nux::Point const& vp);
+  void SetWorkareaGeometry(nux::Geometry const& geo);
 
 protected:
   virtual void AddProperties(GVariantBuilder* builder);
@@ -163,8 +164,9 @@
   bool scale_active_for_group_;
   unsigned current_desktop_;
   nux::Size viewport_size_;
+  nux::Point current_vp_;
+  nux::Geometry workarea_geo_;
   std::map<Window, StandaloneWindow::Ptr> standalone_windows_;
-  nux::Point current_vp_;
 };
 
 }