Merge lp:~3v1n0/unity/maximized-deco-dragging-fix into lp:unity

[Marco Trevisan (Treviño)]

PluginAdapter: take in account the window border size when restoring it from maximization state

Also don't forget about monitor scaling when getting data from the decoration Style.

[Brandon Schaefer (brandontschaefer)]

LGTM

review: Approve

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:3926
http://jenkins.qa.ubuntu.com/job/unity-ci/691/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-trusty-amd64-ci/227
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-trusty-armhf-ci/223
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-trusty-i386-ci/225

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

review: Approve (continuous-integration)

=== modified file 'unity-shared/PluginAdapter.cpp'
--- unity-shared/PluginAdapter.cpp	2014-02-20 02:24:37 +0000
+++ unity-shared/PluginAdapter.cpp	2014-02-20 02:24:37 +0000
@@ -20,6 +20,7 @@
 #include <glib.h>
 #include <gdk/gdkx.h>
 #include "UScreen.h"
+#include "UnitySettings.h"
 #include "DecorationStyle.h"
 #include "PluginAdapter.h"
 #include "CompizUtils.h"
@@ -699,8 +700,20 @@
   if (window && (window->state() & MAXIMIZE_STATE))
   {
     nux::Geometry new_geo(GetWindowSavedGeometry(window_id));
+    decoration::Border border;
+    double scale = 1.0f;
+
+    if (compiz_utils::IsWindowFullyDecorable(window))
+    {
+      auto& settings = Settings::Instance();
+      border = decoration::Style::Get()->Border();
+      scale = settings.em(MonitorGeometryIn(new_geo))->DPIScale();
+    }
+
     new_geo.x = x;
     new_geo.y = y;
+    new_geo.width -= (border.left - border.right) * scale;
+    new_geo.height -= (border.top - border.bottom) * scale;
     window->maximize(0);
     MoveResizeWindow(window_id, new_geo);
   }
@@ -1011,6 +1024,24 @@
   return nux::Geometry(0, 0, m_Screen->width(), m_Screen->height());
 }
 
+template<typename T>
+nux::Size get_edge_size(WindowManager::Edge edge, CompRect const& win_rect, T const& extents)
+{
+  switch (edge)
+  {
+    case WindowManager::Edge::LEFT:
+      return nux::Size(extents.left, win_rect.height());
+    case WindowManager::Edge::TOP:
+      return nux::Size(win_rect.width(), extents.top);
+    case WindowManager::Edge::RIGHT:
+      return nux::Size(extents.right, win_rect.height());
+    case WindowManager::Edge::BOTTOM:
+      return nux::Size(win_rect.width(), extents.bottom);
+  }
+
+  return nux::Size();
+}
+
 nux::Size PluginAdapter::GetWindowDecorationSize(Window window_id, WindowManager::Edge edge) const
 {
   if (CompWindow* window = m_Screen->findWindow(window_id))
@@ -1018,18 +1049,19 @@
     if (compiz_utils::IsWindowFullyDecorable(window))
     {
       auto const& win_rect = window->borderRect();
-      auto const& extents = decoration::Style::Get()->Border();
 
-      switch (edge)
-      {
-        case Edge::LEFT:
-          return nux::Size(extents.left, win_rect.height());
-        case Edge::TOP:
-          return nux::Size(win_rect.width(), extents.top);
-        case Edge::RIGHT:
-          return nux::Size(extents.right, win_rect.height());
-        case Edge::BOTTOM:
-          return nux::Size(win_rect.width(), extents.bottom);
+      if ((window->state() & MAXIMIZE_STATE) == MAXIMIZE_STATE)
+      {
+        auto const& extents = decoration::Style::Get()->Border();
+        nux::Geometry win_geo(win_rect.x(), win_rect.y(), win_rect.width(), win_rect.height());
+        auto deco_size = get_edge_size(edge, win_rect, extents);
+        double scale = Settings::Instance().em(MonitorGeometryIn(win_geo))->DPIScale();
+        return nux::Size(deco_size.width * scale, deco_size.height * scale);
+      }
+      else
+      {
+        auto const& extents = window->border();
+        return get_edge_size(edge, win_rect, extents);
       }
     }
   }

=== modified file 'unity-shared/UScreen.cpp'
--- unity-shared/UScreen.cpp	2014-02-07 16:31:54 +0000
+++ unity-shared/UScreen.cpp	2014-02-20 02:24:37 +0000
@@ -133,7 +133,9 @@
   {
     GdkRectangle rect = { 0 };
     gdk_screen_get_monitor_geometry(screen_, i, &rect);
-    nux::Geometry geo(rect.x, rect.y, rect.width, rect.height);
+
+    float scale = gdk_screen_get_monitor_scale_factor(screen_, i);
+    nux::Geometry geo(rect.x*scale, rect.y*scale, rect.width*scale, rect.height*scale);
 
     // Check for mirrored displays
     if (geo == last_geo)

=== modified file 'unity-shared/UnitySettings.cpp'
--- unity-shared/UnitySettings.cpp	2014-02-20 02:24:37 +0000
+++ unity-shared/UnitySettings.cpp	2014-02-20 02:24:37 +0000
@@ -40,9 +40,9 @@
 const std::string FORM_FACTOR = "form-factor";
 const std::string DOUBLE_CLICK_ACTIVATE = "double-click-activate";
 
-// FIXME Remove me when hikikos settings changes land in unity
+// FIXME Remove this (and UScreen changes) when hikikos settings changes land in unity
 const std::string GNOME_SETTINGS      = "org.gnome.desktop.interface";
-const std::string TEXT_SCALING_FACTOR = "text-scaling-factor";
+const std::string SCALING_FACTOR = "scaling-factor";
 }
 
 //
@@ -74,7 +74,7 @@
       parent_->double_click_activate.changed.emit(cached_double_click_activate_);
     });
 
-    signals_.Add<void, GSettings*, const gchar*>(gnome_settings_, "changed::" + TEXT_SCALING_FACTOR, [this] (GSettings*, const gchar* t) {
+    signals_.Add<void, GSettings*, const gchar*>(gnome_settings_, "changed::" + SCALING_FACTOR, [this] (GSettings*, const gchar* t) {
       UpdateEMConverter();
     });
 
@@ -136,9 +136,9 @@
   int GetDPI(int monitor = 0) const
   {
     int dpi = 96;
-    float scale = g_settings_get_double(gnome_settings_, TEXT_SCALING_FACTOR.c_str());
+    int scale = g_settings_get_uint(gnome_settings_, SCALING_FACTOR.c_str());
 
-    return dpi * scale;
+    return dpi * (scale > 0 ? scale : 1);
   }
 
   void UpdateFontSize()