Merge lp:~unity-team/unity/trusty-1374785 into lp:unity/7.2

[Stephen M. Webb]

Make sure GetScreenGeometry returns the correct value (fixes #1374785).

This fix is cherry-picked from trunk for SRUing into Ubuntu 14.04 LTS.

Unmerged revisions

=== modified file 'debian/changelog'
--- debian/changelog	2014-08-26 13:49:00 +0000
+++ debian/changelog	2014-12-09 18:53:08 +0000
@@ -1,3 +1,9 @@
+unity (7.2.3+14.04.20140826-0ubuntu2) UNRELEASED; urgency=medium
+
+  * Make sure GetScreenGeometry returns the correct value (lp: #1374785).
+
+ -- Andrea Azzarone <[e-mail]>  Tue, 09 Dec 2014 13:49:07 -0500
+
 unity (7.2.3+14.04.20140826-0ubuntu1) trusty; urgency=medium
 
   [ Andrea Azzarone ]

=== modified file 'unity-shared/UScreen.cpp'
--- unity-shared/UScreen.cpp	2014-04-08 16:29:49 +0000
+++ unity-shared/UScreen.cpp	2014-12-09 18:53:08 +0000
@@ -80,6 +80,15 @@
 
 int UScreen::GetMonitorAtPosition(int x, int y) const
 {
+  int idx = 0;
+
+  for (auto const& monitor : monitors_)
+  {
+    if (monitor.IsPointInside(x, y))
+      return idx;
+    ++idx;
+  }
+
   return gdk_screen_get_monitor_at_point(screen_, x, y);
 }
 
@@ -95,9 +104,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