vitalif
/
kwin
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Remove use of KPixmapEffect 

svn path=/trunk/KDE/kdebase/workspace/; revision=717831
icc-effect-5.14.5
Luciano Montanaro 2007-09-27 16:54:08 +00:00
parent 9606247f8a
commit 5654c77fa1
2 changed files with 23 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
clients/laptop/CMakeLists.txt
View File

@ -6,8 +6,7 @@ set(kwin3_laptop_PART_SRCS laptopclient.cpp)
kde4_add_plugin(kwin3_laptop ${kwin3_laptop_PART_SRCS}) kde4_add_plugin(kwin3_laptop ${kwin3_laptop_PART_SRCS})
target_link_libraries(kwin3_laptop ${KDE4_KDECORE_LIBS} ${KDE4_KDEFX_LIBS} kdecorations) target_link_libraries(kwin3_laptop kdecorations)
target_link_libraries(kwin3_laptop ${KDE4_KDEFX_LIBS} kdecorations)
install(TARGETS kwin3_laptop DESTINATION ${PLUGIN_INSTALL_DIR}) install(TARGETS kwin3_laptop DESTINATION ${PLUGIN_INSTALL_DIR})

51
clients/laptop/laptopclient.cpp
View File

@ -8,15 +8,12 @@
#include <kconfig.h> // up here to avoid X11 header conflict :P #include <kconfig.h> // up here to avoid X11 header conflict :P
#include "laptopclient.h" #include "laptopclient.h"
#include <qdrawutil.h>
//Added by qt3to4:
#include <QPixmap> #include <QPixmap>
#include <QPaintEvent> #include <QPaintEvent>
#include <kpixmapeffect.h>
#include <kglobal.h>
#include <klocale.h>
#include <QBitmap> #include <QBitmap>
#include <QPainter> #include <QPainter>
#include <kglobal.h>
#include <klocale.h>
namespace Laptop { namespace Laptop {
@ -80,6 +77,16 @@ static inline const KDecorationOptions* options()
return KDecoration::options(); return KDecoration::options();
} }
static void gradientFill(QPixmap *pixmap, const QColor &color1, const QColor &color2, bool diagonal = false)
{
QPainter p(pixmap);
QLinearGradient gradient(0, 0, diagonal ? pixmap->width() : 0, pixmap->height());
gradient.setColorAt(0.0, color1);
gradient.setColorAt(1.0, color2);
QBrush brush(gradient);
p.fillRect(pixmap->rect(), brush);
}
static void drawButtonFrame(QPixmap *pix, const QPalette &g, bool sunken) static void drawButtonFrame(QPixmap *pix, const QPalette &g, bool sunken)
{ {
QPainter p; QPainter p;
@ -147,15 +154,9 @@ static void create_pixmaps()
aUpperGradient = new QPixmap(32, titleHeight+2); aUpperGradient = new QPixmap(32, titleHeight+2);
iUpperGradient = new QPixmap(32, titleHeight+2); iUpperGradient = new QPixmap(32, titleHeight+2);
QColor bgColor = options()->color(KDecoration::ColorTitleBar, true); QColor bgColor = options()->color(KDecoration::ColorTitleBar, true);
KPixmapEffect::gradient(*aUpperGradient, gradientFill(aUpperGradient, bgColor.light(120), bgColor.dark(120));
bgColor.light(120),
bgColor.dark(120),
KPixmapEffect::VerticalGradient);
bgColor = options()->color(KDecoration::ColorTitleBar, false); bgColor = options()->color(KDecoration::ColorTitleBar, false);
KPixmapEffect::gradient(*iUpperGradient, gradientFill(iUpperGradient, bgColor.light(120), bgColor.dark(120));
bgColor.light(120),
bgColor.dark(120),
KPixmapEffect::VerticalGradient);
} }
// buttons (active/inactive, sunken/unsunken, 2 sizes each) // buttons (active/inactive, sunken/unsunken, 2 sizes each)
QPalette g = options()->palette(KDecoration::ColorButtonBg, true); QPalette g = options()->palette(KDecoration::ColorButtonBg, true);
@ -170,25 +171,17 @@ static void create_pixmaps()
iBtnPix2 = new QPixmap(btnWidth2, titleHeight); iBtnPix2 = new QPixmap(btnWidth2, titleHeight);
iBtnDownPix2 = new QPixmap(btnWidth2, titleHeight); iBtnDownPix2 = new QPixmap(btnWidth2, titleHeight);
if(QPixmap::defaultDepth() > 8){ if(QPixmap::defaultDepth() > 8){
KPixmapEffect::gradient(*btnPix1, c.light(120), c.dark(130), gradientFill(btnPix1, c.light(120), c.dark(130), true);
KPixmapEffect::DiagonalGradient); gradientFill(btnPix2, c.light(120), c.dark(130), true);
KPixmapEffect::gradient(*btnDownPix1, c.dark(130), c.light(120), gradientFill(btnDownPix1, c.light(120), c.dark(130), true);
KPixmapEffect::DiagonalGradient); gradientFill(btnDownPix2, c.light(120), c.dark(130), true);
KPixmapEffect::gradient(*btnPix2, c.light(120), c.dark(130),
KPixmapEffect::DiagonalGradient);
KPixmapEffect::gradient(*btnDownPix2, c.dark(130), c.light(120),
KPixmapEffect::DiagonalGradient);
g = options()->palette(KDecoration::ColorButtonBg, false); g = options()->palette(KDecoration::ColorButtonBg, false);
g.setCurrentColorGroup( QPalette::Active ); g.setCurrentColorGroup( QPalette::Active );
c = g.color(QPalette::Background); c = g.color(QPalette::Background);
KPixmapEffect::gradient(*iBtnPix1, c.light(120), c.dark(130), gradientFill(iBtnPix1, c.light(120), c.dark(130), true);
KPixmapEffect::DiagonalGradient); gradientFill(iBtnPix2, c.light(120), c.dark(130), true);
KPixmapEffect::gradient(*iBtnDownPix1, c.dark(130), c.light(120), gradientFill(iBtnDownPix1, c.light(120), c.dark(130), true);
KPixmapEffect::DiagonalGradient); gradientFill(iBtnDownPix2, c.light(120), c.dark(130), true);
KPixmapEffect::gradient(*iBtnPix2, c.light(120), c.dark(130),
KPixmapEffect::DiagonalGradient);
KPixmapEffect::gradient(*iBtnDownPix2, c.dark(130), c.light(120),
KPixmapEffect::DiagonalGradient);
} }
else{ else{
btnPix1->fill(c.rgb()); btnPix1->fill(c.rgb());