yukijoou/kwin
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Simplify maximization.

Browse source 
svn path=/trunk/kdebase/kwin/; revision=331777
This commit is contained in:
Luboš Luňák 2004-07-22 15:17:54 +00:00
parent 1ca1275a37
commit 3bc4193b8a
4 changed files with 6 additions and 24 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
clients/default/kdedefault.cpp
View file

@ -971,12 +971,7 @@ void KDEDefaultClient::keepBelowChange( bool below )
void KDEDefaultClient::slotMaximize() void KDEDefaultClient::slotMaximize()
{ {
if ( button[BtnMax]->last_button == MidButton ) maximize( button[BtnMax]->last_button );
maximize( maximizeMode() ^ MaximizeVertical );
else if ( button[BtnMax]->last_button == RightButton )
maximize( maximizeMode() ^ MaximizeHorizontal );
else
maximize( maximizeMode() == MaximizeFull ? MaximizeRestore : MaximizeFull );
} }
void KDEDefaultClient::slotAbove() void KDEDefaultClient::slotAbove()

2
clients/default/kdedefault.h
View file

@ -55,7 +55,7 @@ class KDEDefaultButton : public QButton, public KDecorationDefines
const QString& tip=NULL, const int realizeBtns = LeftButton); const QString& tip=NULL, const int realizeBtns = LeftButton);
~KDEDefaultButton(); ~KDEDefaultButton();
int last_button; ButtonState last_button;
void turnOn( bool isOn ); void turnOn( bool isOn );
void setBitmap(const unsigned char *bitmap); void setBitmap(const unsigned char *bitmap);
QSize sizeHint() const; QSize sizeHint() const;

17
clients/keramik/keramik.cpp
View file

@ -733,7 +733,7 @@ QValueList< KeramikHandler::BorderSize > KeramikHandler::borderSizes() const
KeramikButton::KeramikButton( KeramikClient* c, const char *name, Button btn, const QString &tip, const int realizeBtns ) KeramikButton::KeramikButton( KeramikClient* c, const char *name, Button btn, const QString &tip, const int realizeBtns )
: QButton( c->widget(), name ), : QButton( c->widget(), name ),
client( c ), button( btn ), hover( false ), lastbutton( 0 ) client( c ), button( btn ), hover( false ), lastbutton( NoButton )
{ {
realizeButtons = realizeBtns; realizeButtons = realizeBtns;
@ -1447,20 +1447,7 @@ void KeramikClient::menuButtonPressed()
void KeramikClient::slotMaximize() void KeramikClient::slotMaximize()
{ {
switch ( button[ MaxButton ]->lastButton() ) maximize( button[ MaxButton ]->lastButton() );
{
case MidButton:
maximize( maximizeMode() ^ MaximizeVertical );
break;
case RightButton:
maximize( maximizeMode() ^ MaximizeHorizontal );
break;
case LeftButton:
maximize( maximizeMode() == MaximizeFull ? MaximizeRestore : MaximizeFull );
break;
}
} }

4
clients/keramik/keramik.h
View file

@ -117,7 +117,7 @@ namespace Keramik {
KeramikButton( KeramikClient *, const char *, Button, const QString &, const int realizeBtns = LeftButton ); KeramikButton( KeramikClient *, const char *, Button, const QString &, const int realizeBtns = LeftButton );
~KeramikButton(); ~KeramikButton();
int lastButton() const { return lastbutton; } ButtonState lastButton() const { return lastbutton; }
private: private:
void enterEvent( QEvent * ); void enterEvent( QEvent * );
@ -130,7 +130,7 @@ namespace Keramik {
KeramikClient *client; KeramikClient *client;
Button button; Button button;
bool hover; bool hover;
int lastbutton; ButtonState lastbutton;
int realizeButtons; int realizeButtons;
}; // class KeramikButton }; // class KeramikButton