Merge lp:~marcobiscaro2112/unity/fixes-754214 into lp:unity

[Marco Biscaro]

A new option to configure the automaximize value is now present.

This does *not* introduce new code paths, it just turns the hardcoded value (75%) in an option that can be configured through ccsm.

[Neil J. Patel (njpatel)]

Looks good, seems to work well. Approved and merged, thanks!

review: Approve

=== modified file 'src/PluginAdapter.cpp'
--- src/PluginAdapter.cpp	2011-05-24 11:29:34 +0000
+++ src/PluginAdapter.cpp	2011-05-25 14:27:06 +0000
@@ -24,7 +24,6 @@
 PluginAdapter * PluginAdapter::_default = 0;
 
 #define MAXIMIZABLE (CompWindowActionMaximizeHorzMask & CompWindowActionMaximizeVertMask & CompWindowActionResizeMask)
-#define COVERAGE_AREA_BEFORE_AUTOMAXIMIZE 0.75
 
 #define MWM_HINTS_FUNCTIONS     (1L << 0)
 #define MWM_HINTS_DECORATIONS   (1L << 1)
@@ -57,6 +56,7 @@
   _grab_show_action = 0;
   _grab_hide_action = 0;
   _grab_toggle_action = 0;
+  _coverage_area_before_automaximize = 0;
 }
 
 PluginAdapter::~PluginAdapter()
@@ -617,7 +617,7 @@
   // not mapped yet
   const XSizeHints& hints = window->sizeHints ();
   covering_part = (float)(window->serverWidth () * window->serverHeight ()) / (float)(screen_width * screen_height);
-  if ((covering_part < COVERAGE_AREA_BEFORE_AUTOMAXIMIZE) || (covering_part > 1.0) ||
+  if ((covering_part < _coverage_area_before_automaximize) || (covering_part > 1.0) ||
       (hints.flags & PMaxSize && (screen_width > hints.max_width || screen_height > hints.max_height)))
   {
     g_debug ("MaximizeIfBigEnough: %s window size doesn't fit", win_wmclass.c_str());
@@ -683,3 +683,8 @@
   /* Initiate the first available action with the arguments */
   _grab_toggle_action->initiate () (_grab_toggle_action, 0, argument);
 }
+
+void
+PluginAdapter::SetCoverageAreaBeforeAutomaximize (float area) {
+  _coverage_area_before_automaximize = area;
+}
 
=== modified file 'src/PluginAdapter.h'
--- src/PluginAdapter.h	2011-04-26 00:57:23 +0000
+++ src/PluginAdapter.h	2011-05-25 14:27:06 +0000
@@ -112,6 +112,8 @@
     void MaximizeIfBigEnough (CompWindow *window);
 
     nux::Geometry GetWindowGeometry (guint32 xid);
+
+    void SetCoverageAreaBeforeAutomaximize (float area);
     
 protected:
     PluginAdapter(CompScreen *screen);
@@ -130,7 +132,9 @@
     CompAction *_grab_show_action;
     CompAction *_grab_hide_action;
     CompAction *_grab_toggle_action;
-    
+
+    float _coverage_area_before_automaximize;
+
     static PluginAdapter *_default;
 };
 
 
=== modified file 'src/unityshell.cpp'
--- src/unityshell.cpp	2011-05-04 13:18:37 +0000
+++ src/unityshell.cpp	2011-05-25 14:27:06 +0000
@@ -763,6 +763,9 @@
     case UnityshellOptions::DashBlurExperimental:
       PlacesSettings::GetDefault ()->SetDashBlurType ((PlacesSettings::DashBlurType)optionGetDashBlurExperimental ());
       break;
+    case UnityshellOptions::AutomaximizeValue:
+      PluginAdapter::Default ()->SetCoverageAreaBeforeAutomaximize (optionGetAutomaximizeValue () / 100.0f);
+      break;
     default:
       break;
   }
@@ -936,6 +939,7 @@
   optionSetPanelFirstMenuInitiate (boost::bind (&UnityScreen::showPanelFirstMenuKeyInitiate, this, _1, _2, _3));
   optionSetPanelFirstMenuTerminate(boost::bind (&UnityScreen::showPanelFirstMenuKeyTerminate, this, _1, _2, _3));
   optionSetLauncherRevealEdgeInitiate (boost::bind (&UnityScreen::launcherRevealEdgeInitiate, this, _1, _2, _3));
+  optionSetAutomaximizeValueNotify (boost::bind (&UnityScreen::optionChanged, this, _1, _2));
 
   for (unsigned int i = 0; i < G_N_ELEMENTS (_ubus_handles); i++)
     _ubus_handles[i] = 0;
 
=== modified file 'unityshell.xml.in'
--- unityshell.xml.in	2011-04-11 08:01:24 +0000
+++ unityshell.xml.in	2011-05-25 14:27:06 +0000
@@ -203,6 +203,13 @@
                         <_name>Static Blur</_name>
                     </desc>
                 </option>
+                <option name="automaximize_value" type="int">
+                    <_short>Automaximize value</_short>
+                    <_long>The minimum value to trigger automaximize.</_long>
+                    <min>1</min>
+                    <max>100</max>
+                    <default>75</default>
+                </option>
             </group>
         </options>
     </plugin>