From cc6b654b6f8c0031f3866e7f0c08238ca8f25b1d Mon Sep 17 00:00:00 2001
From: Sandro Giessl <sgiessl@gmail.com>
Date: Sun, 25 Jul 2004 11:43:57 +0000
Subject: [PATCH] use new maximize() overload

svn path=/trunk/kdebase/kwin/; revision=332523
---
 clients/modernsystem/modernsys.cpp | 15 ++++-----------
 clients/modernsystem/modernsys.h   |  2 +-
 clients/redmond/redmond.cpp        | 12 +++++-------
 clients/redmond/redmond.h          |  2 +-
 4 files changed, 11 insertions(+), 20 deletions(-)

diff --git a/clients/modernsystem/modernsys.cpp b/clients/modernsystem/modernsys.cpp
index 7f5f42b754..9821611dc1 100644
--- a/clients/modernsystem/modernsys.cpp
+++ b/clients/modernsystem/modernsys.cpp
@@ -278,7 +278,8 @@ QValueList< ModernSysFactory::BorderSize > ModernSysFactory::borderSizes() const
 
 ModernButton::ModernButton(ModernSys *parent, const char *name,
                            const unsigned char *bitmap, const QString& tip, const int realizeBtns)
-    : QButton(parent->widget(), name)
+    : QButton(parent->widget(), name),
+      last_button( NoButton ) 
 {
     setBackgroundMode( NoBackground );
     setCursor( arrowCursor );
@@ -443,16 +444,8 @@ void ModernSys::init()
 
 void ModernSys::maxButtonClicked( )
 {
-    switch ( button[BtnMaximize]->last_button ) {
-    case MidButton:
-       maximize( maximizeMode() ^ MaximizeVertical );
-       break;
-    case RightButton:
-       maximize( maximizeMode() ^ MaximizeHorizontal );
-       break;
-    default: //LeftButton:
-       maximize( maximizeMode() == MaximizeFull ? MaximizeRestore : MaximizeFull );
-       break;
+    if (button[BtnMaximize]) {
+        maximize(button[BtnMaximize]->last_button);
     }
 }
 
diff --git a/clients/modernsystem/modernsys.h b/clients/modernsystem/modernsys.h
index a670937190..48f70dc5c0 100644
--- a/clients/modernsystem/modernsys.h
+++ b/clients/modernsystem/modernsys.h
@@ -36,7 +36,7 @@ protected:
 
     int realizeButtons;
 public:
-    int last_button;
+    ButtonState last_button;
 };
 
 class ModernSys : public KDecoration
diff --git a/clients/redmond/redmond.cpp b/clients/redmond/redmond.cpp
index 4b49789523..e55be16e7c 100644
--- a/clients/redmond/redmond.cpp
+++ b/clients/redmond/redmond.cpp
@@ -236,7 +236,8 @@ void delete_pixmaps()
 
 RedmondButton::RedmondButton(RedmondDeco *parent, const char *name,
       const unsigned char *bitmap, bool menuButton, bool isMini, int size, const QString& tip, const int realizeBtns)
-    : QButton(parent->widget(), name)
+    : QButton(parent->widget(), name),
+      last_button( NoButton ) 
 {
 	// Eliminate background flicker
 	setBackgroundMode( NoBackground );
@@ -484,12 +485,9 @@ void RedmondDeco::iconChange()
 
 void RedmondDeco::slotMaximize()
 {
-    if ( button[BtnMax]->last_button == MidButton )
-       maximize( maximizeMode() ^ MaximizeVertical );
-    else if ( button[BtnMax]->last_button == RightButton )
-       maximize( maximizeMode() ^ MaximizeHorizontal );
-    else
-       maximize( maximizeMode() == MaximizeFull ? MaximizeRestore : MaximizeFull );
+    if (button[BtnMax]) {
+        maximize(button[BtnMax]->last_button);
+    }
 }
 
 
diff --git a/clients/redmond/redmond.h b/clients/redmond/redmond.h
index 7e1d06d769..88a3744c9e 100644
--- a/clients/redmond/redmond.h
+++ b/clients/redmond/redmond.h
@@ -46,7 +46,7 @@ public:
 	void reset();
 
 	QSize sizeHint() const;
-	int   last_button;
+	ButtonState last_button;
 
 protected:
 	void mousePressEvent(QMouseEvent* e);