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

used inline functions to get decisions that combine multiple options and window state

Browse source 
svn path=/trunk/KDE/kdebase/workspace/; revision=1020951
This commit is contained in:
Hugo Pereira Da Costa 2009-09-07 17:26:56 +00:00
parent 8f72704c20
commit 3455dda8d5
3 changed files with 11 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
clients/nitrogen/nitrogenbutton.cpp
View file

@ -162,7 +162,7 @@ namespace Nitrogen
dark.setAlpha(120); dark.setAlpha(120);
if(client_.isActive() && client_.configuration().drawSeparator() && !client_.configuration().drawTitleOutline() ) if( client_.drawSeparator() )
{ helper_.drawSeparator(&painter, QRect(x, titleHeight-1.5, w, 2), color, Qt::Horizontal); } { helper_.drawSeparator(&painter, QRect(x, titleHeight-1.5, w, 2), color, Qt::Horizontal); }
// for menu button the application icon is used // for menu button the application icon is used

4
clients/nitrogen/nitrogenclient.cpp
View file

@ -745,7 +745,7 @@ namespace Nitrogen
frame.getRect(&x, &y, &w, &h); frame.getRect(&x, &y, &w, &h);
// separator // separator
if( isActive() && configuration().drawSeparator() && !configuration().drawTitleOutline() ) if( drawSeparator() )
{ helper().drawSeparator(&painter, QRect(x, titleTop+titleHeight-1.5, w, 2), color, Qt::Horizontal); } { helper().drawSeparator(&painter, QRect(x, titleTop+titleHeight-1.5, w, 2), color, Qt::Horizontal); }
// shadow and resize handles // shadow and resize handles
@ -902,7 +902,7 @@ namespace Nitrogen
p.setRenderHint( QPainter::Antialiasing ); p.setRenderHint( QPainter::Antialiasing );
p.setPen( Qt::NoPen ); p.setPen( Qt::NoPen );
if( active && configuration().useOxygenShadows() ) if( useOxygenShadows() )
{ {
//--------------------------------------------------------------- //---------------------------------------------------------------

8
clients/nitrogen/nitrogenclient.h
View file

@ -61,6 +61,14 @@ namespace Nitrogen
//! true if window is maximized //! true if window is maximized
virtual bool isMaximized( void ) const; virtual bool isMaximized( void ) const;
//! true when separator is to be drawn
virtual bool drawSeparator( void ) const
{ return isActive() && configuration().drawSeparator() && !configuration().drawTitleOutline(); }
//! true when oxygen 'glow' shadow is to be drawn for active window
virtual bool useOxygenShadows( void ) const
{ return isActive() && configuration().useOxygenShadows(); }
//! dimensions //! dimensions
virtual int layoutMetric(LayoutMetric lm, bool respectWindowState = true, const KCommonDecorationButton * = 0) const; virtual int layoutMetric(LayoutMetric lm, bool respectWindowState = true, const KCommonDecorationButton * = 0) const;