Merge lp:~azzar1/unity/fix-maximimize-button-if-vert-horz into lp:unity

[Andrea Azzarone]

Display unmaximize button if the window is vertically or horizontally maximized.

=== modified file 'decorations/DecoratedWindow.cpp'
--- decorations/DecoratedWindow.cpp	2016-07-27 10:17:42 +0000
+++ decorations/DecoratedWindow.cpp	2016-08-01 11:02:01 +0000
@@ -118,6 +118,10 @@
   else
     Undecorate();
 
+  auto const& maximize_button = maximize_button_.lock();
+  if (maximize_button)
+    maximize_button->UpdateTexture();
+
   last_mwm_decor_ = win_->mwmDecor();
   last_actions_ = win_->actions();
 }
@@ -410,7 +414,11 @@
     top_layout_->Append(std::make_shared<WindowButton>(win_, WindowButtonType::MINIMIZE));
 
   if (win_->actions() & (CompWindowActionMaximizeHorzMask|CompWindowActionMaximizeVertMask))
-    top_layout_->Append(std::make_shared<WindowButton>(win_, WindowButtonType::MAXIMIZE));
+  {
+    auto maximize_button = std::make_shared<WindowButton>(win_, WindowButtonType::MAXIMIZE);
+    maximize_button_ = maximize_button;
+    top_layout_->Append(maximize_button);
+  }
 
   auto title = std::make_shared<Title>();
   title->text = last_title_.empty() ? WindowManager::Default().GetWindowName(win_->id()) : last_title_;
 
=== modified file 'decorations/DecorationsPriv.h'
--- decorations/DecorationsPriv.h	2016-07-26 11:33:50 +0000
+++ decorations/DecorationsPriv.h	2016-08-01 11:02:01 +0000
@@ -49,6 +49,7 @@
 class MenuLayout;
 class SlidingLayout;
 class ForceQuitDialog;
+class WindowButton;
 
 namespace cu = compiz_utils;
 
@@ -164,6 +165,7 @@
   std::shared_ptr<ForceQuitDialog> force_quit_;
   InputMixer::Ptr input_mixer_;
   Layout::Ptr top_layout_;
+  uweak_ptr<WindowButton> maximize_button_;
   uweak_ptr<MenuLayout> menus_;
   uweak_ptr<Title> title_;
   uweak_ptr<SlidingLayout> sliding_layout_;
 
=== modified file 'decorations/DecorationsWindowButton.cpp'
--- decorations/DecorationsWindowButton.cpp	2014-02-27 07:11:16 +0000
+++ decorations/DecorationsWindowButton.cpp	2016-08-01 11:02:01 +0000
@@ -44,7 +44,14 @@
 
 void WindowButton::UpdateTexture()
 {
-  SetTexture(DataPool::Get()->ButtonTexture(scale(), type_, GetCurrentState()));
+  auto type = type_;
+
+  if (type == WindowButtonType::MAXIMIZE && 
+      (win_->state() & CompWindowStateMaximizedVertMask || 
+       win_->state() & CompWindowStateMaximizedHorzMask))
+    type = WindowButtonType::UNMAXIMIZE;
+
+  SetTexture(DataPool::Get()->ButtonTexture(scale(), type, GetCurrentState()));
 }
 
 WidgetState WindowButton::GetCurrentState() const
 
=== modified file 'decorations/DecorationsWindowButton.h'
--- decorations/DecorationsWindowButton.h	2014-02-19 00:03:24 +0000
+++ decorations/DecorationsWindowButton.h	2016-08-01 11:02:01 +0000
@@ -34,6 +34,7 @@
   WindowButton(CompWindow*, WindowButtonType type);
 
   WidgetState GetCurrentState() const;
+  void UpdateTexture();
 
 protected:
   void ButtonDownEvent(CompPoint const&, unsigned button, Time) override;
@@ -44,8 +45,6 @@
   void AddProperties(debug::IntrospectionData&);
 
 private:
-  void UpdateTexture();
-
   WindowButtonType type_;
   bool pressed_;
   bool was_pressed_;