Merge lp:~azzar1/unity/fix-lp-1374785 into lp:unity

[Andrea Azzarone]

Make sure GetScreenGeometry returns the correct value.

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

+1

review: Approve

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:3886
http://jenkins.qa.ubuntu.com/job/unity-ci/1114/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-vivid-amd64-ci/1/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-vivid-armhf-ci/1
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-vivid-i386-ci/1

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

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:3886
http://jenkins.qa.ubuntu.com/job/unity-ci/1115/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-vivid-amd64-ci/2
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-vivid-armhf-ci/2
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-vivid-i386-ci/2

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

review: Approve (continuous-integration)

=== modified file 'unity-shared/UScreen.cpp'
--- unity-shared/UScreen.cpp	2014-08-05 21:22:40 +0000
+++ unity-shared/UScreen.cpp	2014-11-07 17:19:07 +0000
@@ -73,21 +73,13 @@
 
 int UScreen::GetMonitorAtPosition(int x, int y) const
 {
-  int monitors = gdk_screen_get_n_monitors(screen_);
+  int idx = 0;
 
-  for (int i = 0; i < monitors; ++i)
+  for (auto const& monitor : monitors_)
   {
-    GdkRectangle rect = { 0 };
-    gdk_screen_get_monitor_geometry(screen_, i, &rect);
-
-    float scale = gdk_screen_get_monitor_scale_factor(screen_, i);
-    nux::Geometry geo(rect.x, rect.y, rect.width, rect.height);
-
-    if (scale != 1.0)
-      geo = geo * scale;
-
-    if (geo.IsPointInside(x, y))
-      return i;
+    if (monitor.IsPointInside(x, y))
+      return idx;
+    ++idx;
   }
 
   return gdk_screen_get_monitor_at_point(screen_, x, y);
@@ -105,9 +97,21 @@
 
 nux::Geometry UScreen::GetScreenGeometry() const
 {
-  int width = gdk_screen_get_width(screen_);
-  int height = gdk_screen_get_height(screen_);
-  return nux::Geometry(0, 0, width, height);
+  if (monitors_.empty())
+    return {};
+
+  auto rightmost_geo = max_element(monitors_.begin(), monitors_.end(), [](nux::Geometry const& a, nux::Geometry const& b) {
+    return a.x + a.width < b.x + b.width;
+  });
+
+  auto lower_geo = max_element(monitors_.begin(), monitors_.end(), [](nux::Geometry const& a, nux::Geometry const& b) {
+    return a.y + a.height < b.y + b.height;
+  });
+
+  auto width = rightmost_geo->x + rightmost_geo->width;
+  auto height = lower_geo->y + lower_geo->height;
+
+  return {0, 0, width, height};
 }
 
 const std::string UScreen::GetMonitorName(int output_number = 0) const