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

Merge branch 'master' into master-no-composite

Browse source
This commit is contained in:
Hugo Pereira Da Costa 2011-06-28 09:09:50 +02:00
commit d3d5d9b9d3
2 changed files with 20 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

26
clients/oxygen/oxygenbutton.cpp
View file

@ -111,11 +111,11 @@ namespace Oxygen
//___________________________________________________
void Button::enterEvent(QEvent *e)
void Button::enterEvent( QEvent* event )
{
KCommonDecorationButton::enterEvent(e);
if (_status != Oxygen::Pressed) _status = Oxygen::Hovered;
KCommonDecorationButton::enterEvent( event );
if( _status != Oxygen::Pressed ) _status = Oxygen::Hovered;
if( animateButtonHover() )
{
@ -127,10 +127,10 @@ namespace Oxygen
}
//___________________________________________________
void Button::leaveEvent(QEvent *e)
void Button::leaveEvent( QEvent* event )
{
KCommonDecorationButton::leaveEvent(e);
KCommonDecorationButton::leaveEvent( event );
if( _status == Oxygen::Hovered && animateButtonHover() )
{
@ -144,30 +144,30 @@ namespace Oxygen
}
//___________________________________________________
void Button::mousePressEvent(QMouseEvent *e)
void Button::mousePressEvent( QMouseEvent* event )
{
if( _type == ButtonMax || e->button() == Qt::LeftButton )
if( _type == ButtonMax || event->button() == Qt::LeftButton )
{
_status = Oxygen::Pressed;
update();
}
KCommonDecorationButton::mousePressEvent(e);
KCommonDecorationButton::mousePressEvent( event );
}
//___________________________________________________
void Button::mouseReleaseEvent(QMouseEvent *e)
void Button::mouseReleaseEvent( QMouseEvent* event )
{
_status = ( rect().contains( e->pos() ) ) ? Oxygen::Hovered:Oxygen::Normal;
_status = ( rect().contains( event->pos() ) ) ? Oxygen::Hovered:Oxygen::Normal;
update();
KCommonDecorationButton::mouseReleaseEvent(e);
KCommonDecorationButton::mouseReleaseEvent( event );
}
//___________________________________________________
void Button::paintEvent(QPaintEvent *event)
void Button::paintEvent( QPaintEvent* event )
{
if( _client.hideTitleBar() ) return;
@ -306,7 +306,7 @@ namespace Oxygen
}
//___________________________________________________
void Button::drawIcon(QPainter *painter)
void Button::drawIcon( QPainter* painter )
{
painter->save();

14
clients/oxygen/oxygenbutton.h
View file

@ -95,31 +95,31 @@ namespace Oxygen
protected:
//! press event
void mousePressEvent(QMouseEvent* );
void mousePressEvent( QMouseEvent* );
//! release event
void mouseReleaseEvent(QMouseEvent* );
void mouseReleaseEvent( QMouseEvent* );
//! enter event
void enterEvent( QEvent* );
//! leave event
void leaveEvent(QEvent* );
void leaveEvent( QEvent* );
//! paint
void paintEvent(QPaintEvent* );
void paintEvent( QPaintEvent* );
//! paint
void paint(QPainter& );
//! draw icon
void drawIcon(QPainter*);
void drawIcon( QPainter* );
//! color
QColor buttonDetailColor(const QPalette& ) const;
QColor buttonDetailColor( const QPalette& ) const;
//! color
QColor buttonDetailColor(const QPalette& palette, bool active ) const
QColor buttonDetailColor( const QPalette& palette, bool active ) const
{
if( _type == ButtonItemClose )
{