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

changed helper.h/.cpp into oxygendecohelper.h/.cpp for consistency with classname.

Browse source 
svn path=/trunk/KDE/kdebase/workspace/; revision=1121943
This commit is contained in:
Hugo Pereira Da Costa 2010-05-02 18:50:01 +00:00
parent 43d7384663
commit 56095681ed
9 changed files with 179 additions and 173 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
clients/oxygen/CMakeLists.txt
View file

@ -5,14 +5,14 @@ include_directories(${KDEBASE_WORKSPACE_SOURCE_DIR}/libs/oxygen)
########### next target ###############
set(kwin_oxygen_SRCS
helper.cpp
oxygenfactory.cpp
oxygenbutton.cpp
oxygenclient.cpp
oxygenclientgroupitemdata.cpp
oxygenconfiguration.cpp
oxygendecohelper.cpp
oxygenexception.cpp
oxygenexceptionlist.cpp
oxygenfactory.cpp
oxygenshadowconfiguration.cpp
oxygenshadowcache.cpp
oxygensizegrip.cpp

143
clients/oxygen/helper.cpp
View file

@ -1,143 +0,0 @@
/*
* Copyright 2008 Long Huynh Huu <long.upcase@googlemail.com>
* Copyright 2007 Matthew Woehlke <mw_triad@users.sourceforge.net>
* Copyright 2007 Casper Boemann <cbr@boemann.dk>
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Library General Public
* License version 2 as published by the Free Software Foundation.
*
* This library is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* Library General Public License for more details.
*
* You should have received a copy of the GNU Library General Public License
* along with this library; see the file COPYING.LIB. If not, write to
* the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
* Boston, MA 02110-1301, USA.
*/
#include "helper.h"
#include <QtGui/QPainter>
//______________________________________________________________________________
OxygenDecoHelper::OxygenDecoHelper(const QByteArray &componentName):
OxygenHelper(componentName)
{}
//______________________________________________________________________________
QPixmap OxygenDecoHelper::windecoButton(const QColor &color, bool pressed, int size)
{
quint64 key = (quint64(color.rgba()) << 32) | (size << 1) | (int)pressed;
QPixmap *pixmap = m_windecoButtonCache.object(key);
if (!pixmap)
{
pixmap = new QPixmap(size, size);
pixmap->fill(Qt::transparent);
QColor light = calcLightColor(color);
QColor dark = calcDarkColor(color);
QPainter p(pixmap);
p.setRenderHints(QPainter::Antialiasing);
p.setPen(Qt::NoPen);
qreal u = size/18.0;
p.translate( 0.5*u, (0.5-0.668)*u );
{
//plain background
QLinearGradient lg( 0, u*1.665, 0, u*(12.33+1.665) );
if( pressed )
{
lg.setColorAt( 1, light );
lg.setColorAt( 0, dark );
} else {
lg.setColorAt( 0, light );
lg.setColorAt( 1, dark );
}
QRectF r( u*0.5*(17-12.33), u*1.665, u*12.33, u*12.33 );
p.setBrush( lg );
p.drawEllipse( r );
}
{
// outline circle
qreal penWidth = 0.7;
QLinearGradient lg( 0, u*1.665, 0, u*(2.0*12.33+1.665) );
lg.setColorAt( 0, light );
lg.setColorAt( 1, dark );
QRectF r( u*0.5*(17-12.33+penWidth), u*(1.665+penWidth), u*(12.33-penWidth), u*(12.33-penWidth) );
p.setPen( QPen( lg, penWidth*u ) );
p.drawEllipse( r );
p.end();
}
m_windecoButtonCache.insert(key, pixmap);
}
return *pixmap;
}
//_______________________________________________________________________
QPixmap OxygenDecoHelper::windecoButtonGlow(const QColor &color, int size)
{
quint64 key = (quint64(color.rgba()) << 32) | size;
QPixmap *pixmap = m_windecoButtonGlowCache.object(key);
if (!pixmap)
{
pixmap = new QPixmap(size, size);
pixmap->fill(Qt::transparent);
// right now the same color is used for the two shadows
QColor light = color;
QColor dark = color;
QPainter p(pixmap);
p.setRenderHints(QPainter::Antialiasing);
p.setPen(Qt::NoPen);
qreal u = size/18.0;
p.translate( 0.5*u, (0.5-0.668)*u );
{
// outer shadow
QRadialGradient rg( u*8.5, u*8.5, u*8.5 );
int nPoints = 5;
qreal x[5] = { 0.61, 0.72, 0.81, 0.9, 1};
qreal values[5] = { 255-172, 255-178, 255-210, 255-250, 0 };
QColor c = dark;
for( int i = 0; i<nPoints; i++ )
{ c.setAlpha( values[i] ); rg.setColorAt( x[i], c ); }
QRectF r( pixmap->rect() );
p.setBrush( rg );
p.drawRect( r );
}
{
// inner shadow
QRadialGradient rg( u*8.5, u*8.5, u*8.5 );
static int nPoints = 6;
qreal x[6] = { 0.61, 0.67, 0.7, 0.74, 0.78, 1 };
qreal values[6] = { 255-92, 255-100, 255-135, 255-205, 255-250, 0 };
QColor c = light;
for( int i = 0; i<nPoints; i++ )
{ c.setAlpha( values[i] ); rg.setColorAt( x[i], c ); }
QRectF r( pixmap->rect() );
p.setBrush( rg );
p.drawRect( r );
}
m_windecoButtonGlowCache.insert(key, pixmap);
}
return *pixmap;
}

2
clients/oxygen/oxygenbutton.h
View file

@ -135,7 +135,7 @@ namespace Oxygen
const Client &client_;
//! helper
OxygenDecoHelper &helper_;
DecoHelper &helper_;
//! button type
ButtonType type_;

8
clients/oxygen/oxygenclient.h
View file

@ -28,12 +28,12 @@
// IN THE SOFTWARE.
//////////////////////////////////////////////////////////////////////////////
#include "oxygenfactory.h"
#include "oxygenanimation.h"
#include "oxygenclientgroupitemdata.h"
#include "oxygenconfiguration.h"
#include "oxygendecohelper.h"
#include "oxygenfactory.h"
#include "oxygentitleanimationdata.h"
#include "oxygenanimation.h"
#include "helper.h"
#include <kcommondecoration.h>
#include <QtCore/QBasicTimer>
@ -140,7 +140,7 @@ namespace Oxygen
//@}
//! helper class
OxygenDecoHelper& helper( void ) const
DecoHelper& helper( void ) const
{ return factory_->helper(); }
//! helper class

147
clients/oxygen/oxygendecohelper.cpp Normal file
View file

@ -0,0 +1,147 @@
/*
* Copyright 2008 Long Huynh Huu <long.upcase@googlemail.com>
* Copyright 2007 Matthew Woehlke <mw_triad@users.sourceforge.net>
* Copyright 2007 Casper Boemann <cbr@boemann.dk>
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Library General Public
* License version 2 as published by the Free Software Foundation.
*
* This library is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* Library General Public License for more details.
*
* You should have received a copy of the GNU Library General Public License
* along with this library; see the file COPYING.LIB. If not, write to
* the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
* Boston, MA 02110-1301, USA.
*/
#include "oxygendecohelper.h"
#include <QtGui/QPainter>
namespace Oxygen
{
//______________________________________________________________________________
DecoHelper::DecoHelper(const QByteArray &componentName):
OxygenHelper(componentName)
{}
//______________________________________________________________________________
QPixmap DecoHelper::windecoButton(const QColor &color, bool pressed, int size)
{
quint64 key = (quint64(color.rgba()) << 32) | (size << 1) | (int)pressed;
QPixmap *pixmap = m_windecoButtonCache.object(key);
if (!pixmap)
{
pixmap = new QPixmap(size, size);
pixmap->fill(Qt::transparent);
QColor light = calcLightColor(color);
QColor dark = calcDarkColor(color);
QPainter p(pixmap);
p.setRenderHints(QPainter::Antialiasing);
p.setPen(Qt::NoPen);
qreal u = size/18.0;
p.translate( 0.5*u, (0.5-0.668)*u );
{
//plain background
QLinearGradient lg( 0, u*1.665, 0, u*(12.33+1.665) );
if( pressed )
{
lg.setColorAt( 1, light );
lg.setColorAt( 0, dark );
} else {
lg.setColorAt( 0, light );
lg.setColorAt( 1, dark );
}
QRectF r( u*0.5*(17-12.33), u*1.665, u*12.33, u*12.33 );
p.setBrush( lg );
p.drawEllipse( r );
}
{
// outline circle
qreal penWidth = 0.7;
QLinearGradient lg( 0, u*1.665, 0, u*(2.0*12.33+1.665) );
lg.setColorAt( 0, light );
lg.setColorAt( 1, dark );
QRectF r( u*0.5*(17-12.33+penWidth), u*(1.665+penWidth), u*(12.33-penWidth), u*(12.33-penWidth) );
p.setPen( QPen( lg, penWidth*u ) );
p.drawEllipse( r );
p.end();
}
m_windecoButtonCache.insert(key, pixmap);
}
return *pixmap;
}
//_______________________________________________________________________
QPixmap DecoHelper::windecoButtonGlow(const QColor &color, int size)
{
quint64 key = (quint64(color.rgba()) << 32) | size;
QPixmap *pixmap = m_windecoButtonGlowCache.object(key);
if (!pixmap)
{
pixmap = new QPixmap(size, size);
pixmap->fill(Qt::transparent);
// right now the same color is used for the two shadows
QColor light = color;
QColor dark = color;
QPainter p(pixmap);
p.setRenderHints(QPainter::Antialiasing);
p.setPen(Qt::NoPen);
qreal u = size/18.0;
p.translate( 0.5*u, (0.5-0.668)*u );
{
// outer shadow
QRadialGradient rg( u*8.5, u*8.5, u*8.5 );
int nPoints = 5;
qreal x[5] = { 0.61, 0.72, 0.81, 0.9, 1};
qreal values[5] = { 255-172, 255-178, 255-210, 255-250, 0 };
QColor c = dark;
for( int i = 0; i<nPoints; i++ )
{ c.setAlpha( values[i] ); rg.setColorAt( x[i], c ); }
QRectF r( pixmap->rect() );
p.setBrush( rg );
p.drawRect( r );
}
{
// inner shadow
QRadialGradient rg( u*8.5, u*8.5, u*8.5 );
static int nPoints = 6;
qreal x[6] = { 0.61, 0.67, 0.7, 0.74, 0.78, 1 };
qreal values[6] = { 255-92, 255-100, 255-135, 255-205, 255-250, 0 };
QColor c = light;
for( int i = 0; i<nPoints; i++ )
{ c.setAlpha( values[i] ); rg.setColorAt( x[i], c ); }
QRectF r( pixmap->rect() );
p.setBrush( rg );
p.drawRect( r );
}
m_windecoButtonGlowCache.insert(key, pixmap);
}
return *pixmap;
}
}

26
clients/oxygen/helper.h → clients/oxygen/oxygendecohelper.h
View file

@ -25,21 +25,25 @@
//! helper class
/*! contains utility functions used at multiple places in oxygen style */
class OxygenDecoHelper : public OxygenHelper
namespace Oxygen
{
class DecoHelper : public OxygenHelper
{
public:
public:
explicit OxygenDecoHelper(const QByteArray &componentName);
virtual ~OxygenDecoHelper() {}
explicit DecoHelper(const QByteArray &componentName);
virtual ~DecoHelper() {}
//!@name decoration specific helper functions
//!
//@{
virtual QPixmap windecoButton(const QColor &color, bool pressed, int size = 21);
virtual QPixmap windecoButtonGlow(const QColor &color, int size = 21);
//@}
//!@name decoration specific helper functions
//!
//@{
virtual QPixmap windecoButton(const QColor &color, bool pressed, int size = 21);
virtual QPixmap windecoButtonGlow(const QColor &color, int size = 21);
//@}
};
};
}
#endif // __OXYGEN_STYLE_HELPER_H

7
clients/oxygen/oxygenfactory.h
View file

@ -32,10 +32,9 @@
#include <kdeversion.h>
#include "oxygenconfiguration.h"
#include "oxygendecohelper.h"
#include "oxygenexceptionlist.h"
#include "oxygenshadowcache.h"
#include "helper.h"
namespace Oxygen
{
@ -105,7 +104,7 @@ namespace Oxygen
{ return initialized_; }
//! helper
virtual OxygenDecoHelper& helper( void )
virtual DecoHelper& helper( void )
{ return helper_; }
//! shadow cache
@ -144,7 +143,7 @@ namespace Oxygen
bool initialized_;
//! helper
OxygenDecoHelper helper_;
DecoHelper helper_;
//! shadow cache
ShadowCache shadowCache_;

2
clients/oxygen/oxygenshadowcache.cpp
View file

@ -37,7 +37,7 @@ namespace Oxygen
{
//_______________________________________________________
ShadowCache::ShadowCache( OxygenDecoHelper& helper ):
ShadowCache::ShadowCache( DecoHelper& helper ):
helper_( helper ),
activeShadowConfiguration_( ShadowConfiguration( QPalette::Active ) ),
inactiveShadowConfiguration_( ShadowConfiguration( QPalette::Inactive ) )

13
clients/oxygen/oxygenshadowcache.h
View file

@ -27,13 +27,12 @@
// IN THE SOFTWARE.
//////////////////////////////////////////////////////////////////////////////
#include "oxygendecohelper.h"
#include "oxygenshadowconfiguration.h"
#include <QtCore/QCache>
#include <QtGui/QRadialGradient>
#include "oxygenshadowconfiguration.h"
#include "helper.h"
class OxygenHelper;
namespace Oxygen
{
@ -44,7 +43,7 @@ namespace Oxygen
public:
//! constructor
ShadowCache( OxygenDecoHelper& helper );
ShadowCache( DecoHelper& helper );
//! destructor
virtual ~ShadowCache( void )
@ -192,7 +191,7 @@ namespace Oxygen
protected:
OxygenHelper& helper( void ) const
DecoHelper& helper( void ) const
{ return helper_; }
private:
@ -202,7 +201,7 @@ namespace Oxygen
void renderGradient( QPainter&, const QRectF&, const QRadialGradient&, bool hasBorder = true ) const;
//! helper
OxygenDecoHelper& helper_;
DecoHelper& helper_;
//! caching enable state
bool enabled_;