removed background window rendering from button paintEvent, as transparent background is good enough. Moved all corresponding method in oxygenClient to 'protected'. This allows faster repaint.
svn path=/trunk/KDE/kdebase/workspace/; revision=1036357
This commit is contained in:
parent
2d88428b6d
commit
f761aceb8b
2 changed files with 27 additions and 40 deletions
|
@ -175,19 +175,6 @@ namespace Oxygen
|
|||
else palette.setCurrentColorGroup(QPalette::Inactive);
|
||||
QColor color = palette.window().color();
|
||||
|
||||
// window background
|
||||
if( type_ != ButtonItemClose && type_ != ButtonItemMenu )
|
||||
{
|
||||
|
||||
client_.renderWindowBackground( &painter, rect(), this, client_.backgroundPalette( this, palette ) );
|
||||
client_.renderWindowBorder( &painter, rect(), this, palette );
|
||||
|
||||
// separator
|
||||
if( client_.drawSeparator() )
|
||||
{ client_.renderSeparator( &painter, rect(), this, color ); }
|
||||
|
||||
}
|
||||
|
||||
// translate buttons up if window maximized
|
||||
if(
|
||||
client_.compositingActive() &&
|
||||
|
|
|
@ -141,6 +141,33 @@ namespace Oxygen
|
|||
|
||||
//@}
|
||||
|
||||
//!@name status change methods (overloaded from KCommonDecorationUnstable)
|
||||
//@{
|
||||
|
||||
//! triggered when window activity is changed
|
||||
virtual void activeChange();
|
||||
|
||||
//! triggered when maximize state changed
|
||||
virtual void maximizeChange();
|
||||
|
||||
//! triggered when window shade is changed
|
||||
virtual void shadeChange();
|
||||
|
||||
//! triggered when window shade is changed
|
||||
virtual void captionChange();
|
||||
|
||||
//@}
|
||||
|
||||
public slots:
|
||||
|
||||
//! reset configuration
|
||||
void resetConfiguration( void );
|
||||
|
||||
protected:
|
||||
|
||||
//! paint
|
||||
virtual void paintEvent( QPaintEvent* );
|
||||
|
||||
//!@name rendering methods (called in paintEvent)
|
||||
//@{
|
||||
|
||||
|
@ -171,33 +198,6 @@ namespace Oxygen
|
|||
|
||||
//@}
|
||||
|
||||
//!@name status change methods (overloaded from KCommonDecorationUnstable)
|
||||
//@{
|
||||
|
||||
//! triggered when window activity is changed
|
||||
virtual void activeChange();
|
||||
|
||||
//! triggered when maximize state changed
|
||||
virtual void maximizeChange();
|
||||
|
||||
//! triggered when window shade is changed
|
||||
virtual void shadeChange();
|
||||
|
||||
//! triggered when window shade is changed
|
||||
virtual void captionChange();
|
||||
|
||||
//@}
|
||||
|
||||
public slots:
|
||||
|
||||
//! reset configuration
|
||||
void resetConfiguration( void );
|
||||
|
||||
protected:
|
||||
|
||||
//! paint
|
||||
virtual void paintEvent( QPaintEvent* );
|
||||
|
||||
//! title timeline
|
||||
bool titleTimeLineIsRunning( void ) const
|
||||
{ return titleTimeLine_.state() == QTimeLine::Running; }
|
||||
|
|
Loading…
Reference in a new issue