Merge lp:~3v1n0/unity/dash-positioning-improvements into lp:unity

[Marco Trevisan (Treviño)]

DashView: ensure that we update scaling when monitor changes

Plus don't increase the input area by border sizes when maximized.

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:4070
http://jenkins.qa.ubuntu.com/job/unity-ci/1408/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-xenial-amd64-ci/58
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-xenial-armhf-ci/58
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-xenial-i386-ci/58

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity-ci/1408/rebuild

review: Approve (continuous-integration)

[Andrea Azzarone (azzar1)]

LGTM.

review: Approve

=== modified file 'dash/DashController.cpp'
--- dash/DashController.cpp	2015-04-21 13:25:04 +0000
+++ dash/DashController.cpp	2016-02-17 18:49:29 +0000
@@ -89,7 +89,7 @@
   }
 
   SetupWindow();
-  UScreen::GetDefault()->changed.connect([this] (int, std::vector<nux::Geometry> const&) { Relayout(true); });
+  UScreen::GetDefault()->changed.connect(sigc::mem_fun(this, &Controller::OnMonitorChanged));
 
   form_factor_changed_ = Settings::Instance().form_factor.changed.connect([this] (FormFactor)
   {
@@ -177,7 +177,6 @@
       HideDash();
     }
   });
-
 }
 
 void Controller::EnsureDash()
@@ -242,19 +241,30 @@
                         monitor_geo.height);
 }
 
-void Controller::Relayout(bool check_monitor)
+void Controller::OnMonitorChanged(int primary, std::vector<nux::Geometry> const& monitors)
+{
+  if (!visible_ || !window_ || !view_)
+    return;
+
+  monitor_ = std::min<int>(GetIdealMonitor(), monitors.size()-1);
+  view_->SetMonitor(monitor_);
+  Relayout();
+}
+
+void Controller::Relayout()
 {
   EnsureDash();
 
-  if (check_monitor)
-    monitor_ = CLAMP(GetIdealMonitor(), 0, static_cast<int>(UScreen::GetDefault()->GetMonitors().size()-1));
-
-  int launcher_width = unity::Settings::Instance().LauncherWidth(monitor_);
-  nux::Geometry geo = GetIdealWindowGeometry();
-
   view_->Relayout();
-  window_->SetGeometry(geo);
-  view_->SetMonitorOffset(launcher_width, panel::Style::Instance().PanelHeight(monitor_));
+  window_->SetGeometry(GetIdealWindowGeometry());
+  UpdateDashPosition();
+}
+
+void Controller::UpdateDashPosition()
+{
+  int top_offset = panel::Style::Instance().PanelHeight(monitor_);
+  int left_offset = unity::Settings::Instance().LauncherWidth(monitor_);
+  view_->SetMonitorOffset(left_offset, top_offset);
 }
 
 void Controller::OnMouseDownOutsideWindow(int x, int y,
@@ -308,18 +318,17 @@
     return false;
   }
 
+  screen_ungrabbed_slot_->disconnect();
   wm.SaveInputFocus();
 
   EnsureDash();
   monitor_ = GetIdealMonitor();
-  screen_ungrabbed_slot_->disconnect();
-  int launcher_width = unity::Settings::Instance().LauncherWidth(monitor_);
-  view_->SetMonitorOffset(launcher_width, panel::Style::Instance().PanelHeight(monitor_));
-  view_->AboutToShow(monitor_);
+  view_->SetMonitor(monitor_);
+  view_->AboutToShow();
+  UpdateDashPosition();
   FocusWindow();
 
   visible_ = true;
-
   StartShowHideTimeline();
 
   nux::Geometry const& view_content_geo = view_->GetContentGeometry();
@@ -470,8 +479,13 @@
   nux::Geometry const& view_content_geo(view_->GetContentGeometry());
 
   nux::Geometry geo(window_geo.x, window_geo.y, view_content_geo.width, view_content_geo.height);
-  geo.width += style.GetDashRightTileWidth().CP(view_->scale());
-  geo.height += style.GetDashBottomTileHeight().CP(view_->scale());
+
+  if (Settings::Instance().form_factor() == FormFactor::DESKTOP)
+  {
+    geo.width += style.GetDashVerticalBorderWidth().CP(view_->scale());
+    geo.height += style.GetDashHorizontalBorderHeight().CP(view_->scale());
+  }
+
   return geo;
 }
 
 
=== modified file 'dash/DashController.h'
--- dash/DashController.h	2015-04-22 23:54:26 +0000
+++ dash/DashController.h	2016-02-17 18:49:29 +0000
@@ -82,7 +82,9 @@
 
   nux::Geometry GetIdealWindowGeometry();
   int GetIdealMonitor();
-  void Relayout(bool check_monitor =false);
+  void OnMonitorChanged(int primary, std::vector<nux::Geometry> const&);
+  void UpdateDashPosition();
+  void Relayout();
 
   void OnMouseDownOutsideWindow(int x, int y, unsigned long bflags, unsigned long kflags);
   void OnExternalShowDash(GVariant* variant);
 
=== modified file 'dash/DashView.cpp'
--- dash/DashView.cpp	2015-08-25 08:15:50 +0000
+++ dash/DashView.cpp	2016-02-17 18:49:29 +0000
@@ -139,10 +139,8 @@
 
   SetupViews();
   SetupUBusConnections();
-
   AddChild(overlay_window_buttons_.GetPointer());
 
-  mouse_down.connect(sigc::mem_fun(this, &DashView::OnMouseButtonDown));
   preview_state_machine_.PreviewActivated.connect(sigc::mem_fun(this, &DashView::BuildPreview));
 
   if (scopes_)
@@ -169,6 +167,15 @@
   RemoveLayout();
 }
 
+void DashView::SetMonitor(int monitor)
+{
+  if (monitor_== monitor)
+    return;
+
+  monitor_ = monitor;
+  scale = Settings::Instance().em(monitor_)->DPIScale();
+}
+
 void DashView::SetMonitorOffset(int x, int y)
 {
   renderer_.x_offset = x;
@@ -460,17 +467,11 @@
   content_view_->SetPresentRedirectedView(true);
 }
 
-void DashView::AboutToShow(int monitor)
+void DashView::AboutToShow()
 {
   visible_ = true;
   search_bar_->text_entry()->SelectAll();
 
-  if (monitor_ != monitor)
-  {
-    monitor_ = monitor;
-    scale = Settings::Instance().em(monitor_)->DPIScale();
-  }
-
   /* Give the scopes a chance to prep data before we map them  */
   if (active_scope_view_)
   {
@@ -614,7 +615,7 @@
       sigc::mem_fun(this, &DashView::OnActivateRequest));
 }
 
-long DashView::PostLayoutManagement (long LayoutResult)
+long DashView::PostLayoutManagement(long LayoutResult)
 {
   Relayout();
   return LayoutResult;
@@ -662,7 +663,12 @@
 nux::Geometry DashView::GetBestFitGeometry(nux::Geometry const& for_geo)
 {
   dash::Style& style = dash::Style::Instance();
-  int panel_height = renderer_.y_offset;
+  int vertical_offset = renderer_.y_offset;
+
+  if (style.always_maximised)
+  {
+    return nux::Geometry(0, vertical_offset, for_geo.width, for_geo.height - vertical_offset);
+  }
 
   int width = 0, height = 0;
   int tile_width = style.GetTileWidth().CP(scale);
@@ -689,14 +695,9 @@
 
   // width/height shouldn't be bigger than the geo available.
   width = std::min(width, for_geo.width); // launcher width is taken into account in for_geo.
-  height = std::min(height, for_geo.height - panel_height); // panel height is not taken into account in for_geo.
+  height = std::min(height, for_geo.height - vertical_offset); // panel height is not taken into account in for_geo.
 
-  if (style.always_maximised)
-  {
-    width = std::max(0, for_geo.width);
-    height = std::max(0, for_geo.height - panel_height);
-  }
-  return nux::Geometry(0, panel_height, width, height);
+  return nux::Geometry(0, vertical_offset, width, height);
 }
 
 void DashView::Draw(nux::GraphicsEngine& graphics_engine, bool force_draw)
@@ -1119,18 +1120,6 @@
   }
 }
 
-void DashView::OnMouseButtonDown(int x, int y, unsigned long button, unsigned long key)
-{
-  nux::Geometry geo(content_geo_);
-
-  if (Settings::Instance().form_factor() == FormFactor::DESKTOP)
-  {
-    dash::Style& style = dash::Style::Instance();
-    geo.width  += style.GetDashRightTileWidth().CP(scale);
-    geo.height += style.GetDashBottomTileHeight().CP(scale);
-  }
-}
-
 void DashView::OnActivateRequest(GVariant* args)
 {
   glib::String uri;
@@ -1508,8 +1497,8 @@
   introspection.add(nux::Geometry(GetAbsoluteX(), GetAbsoluteY(), content_geo_.width, content_geo_.height))
                .add("num_rows", num_rows)
                .add("form_factor", form_factor)
-               .add("right-border-width", style.GetDashRightTileWidth().CP(scale))
-               .add("bottom-border-height", style.GetDashBottomTileHeight().CP(scale))
+               .add("vertical-border-width", style.GetDashVerticalBorderWidth().CP(scale))
+               .add("horizontal-border-height", style.GetDashHorizontalBorderHeight().CP(scale))
                .add("preview_displaying", preview_displaying_)
                .add("preview_animation", animate_split_value_ * animate_preview_container_value_ * animate_preview_value_)
                .add("dash_maximized", style.always_maximised())
 
=== modified file 'dash/DashView.h'
--- dash/DashView.h	2015-08-25 08:15:50 +0000
+++ dash/DashView.h	2016-02-17 18:49:29 +0000
@@ -64,11 +64,12 @@
 
   nux::Property<double> scale;
 
-  void AboutToShow(int monitor);
+  void AboutToShow();
   void AboutToHide();
   void Relayout();
   void DisableBlur();
   void OnActivateRequest(GVariant* args);
+  void SetMonitor(int monitor);
   void SetMonitorOffset(int x, int y);
 
   bool IsCommandLensOpen() const;
@@ -108,7 +109,6 @@
   void BuildPreview(Preview::Ptr model);
   void ClosePreview();
   void OnPreviewAnimationFinished();
-  void OnMouseButtonDown(int x, int y, unsigned long button, unsigned long key);
   void OnBackgroundColorChanged(GVariant* args);
   void OnSearchChanged(std::string const& search_string);
   void OnLiveSearchReached(std::string const& search_string);
 
=== modified file 'dash/StandaloneDash.cpp'
--- dash/StandaloneDash.cpp	2015-11-06 18:13:34 +0000
+++ dash/StandaloneDash.cpp	2016-02-17 18:49:29 +0000
@@ -74,7 +74,7 @@
   layout->AddView (view, 1, nux::MINOR_POSITION_CENTER);
   layout->SetMinMaxSize(WIDTH.CP(scale_), HEIGHT.CP(scale_));
 
-  view->AboutToShow(0);
+  view->AboutToShow();
 
   nux::GetWindowThread()->SetLayout (layout);
   nux::GetWindowCompositor().SetKeyFocusArea(view->default_focus());
 
=== modified file 'tests/autopilot/unity/tests/test_dash.py'
--- tests/autopilot/unity/tests/test_dash.py	2015-10-03 01:10:59 +0000
+++ tests/autopilot/unity/tests/test_dash.py	2016-02-17 18:49:29 +0000
@@ -740,7 +740,7 @@
         if (self.unity.dash.view.form_factor != "desktop"):
             self.skip("Not in desktop form-factor.")
 
-        x = self.unity.dash.view.x + self.unity.dash.view.width + self.unity.dash.view.right_border_width / 2
+        x = self.unity.dash.view.x + self.unity.dash.view.width + self.unity.dash.view.vertical_border_width / 2
         y = self.unity.dash.view.y + self.unity.dash.view.height / 2
 
         self.mouse.move(x, y)
@@ -756,7 +756,7 @@
             self.skip("Not in desktop form-factor.")
 
         x = self.unity.dash.view.x + self.unity.dash.view.width / 2
-        y = self.unity.dash.view.y + self.unity.dash.view.height + self.unity.dash.view.bottom_border_height / 2
+        y = self.unity.dash.view.y + self.unity.dash.view.height + self.unity.dash.view.horizontal_border_height / 2
 
         self.mouse.move(x, y)
         self.mouse.click()
 
=== modified file 'unity-shared/DashStyle.cpp'
--- unity-shared/DashStyle.cpp	2016-02-09 01:26:22 +0000
+++ unity-shared/DashStyle.cpp	2016-02-17 18:49:29 +0000
@@ -2306,12 +2306,12 @@
   return pimpl->dash_shine_.texture();
 }
 
-RawPixel Style::GetDashBottomTileHeight() const
+RawPixel Style::GetDashHorizontalBorderHeight() const
 {
   return 30;
 }
 
-RawPixel Style::GetDashRightTileWidth() const
+RawPixel Style::GetDashVerticalBorderWidth() const
 {
   return 30;
 }
 
=== modified file 'unity-shared/DashStyle.h'
--- unity-shared/DashStyle.h	2014-07-10 19:30:17 +0000
+++ unity-shared/DashStyle.h	2016-02-17 18:49:29 +0000
@@ -184,8 +184,8 @@
   BaseTexturePtr GetDashTopCorner(double scale) const;
   BaseTexturePtr GetDashTopCornerMask(double scale) const;
 
-  RawPixel GetDashBottomTileHeight() const;
-  RawPixel GetDashRightTileWidth() const;
+  RawPixel GetDashHorizontalBorderHeight() const;
+  RawPixel GetDashVerticalBorderWidth() const;
 
   BaseTexturePtr const& GetDashShine() const;