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

Compile fixes (KPixmap)

Browse source 
svn path=/trunk/KDE/kdebase/workspace/; revision=536502
This commit is contained in:
Bernhard Rosenkraenzer 2006-05-02 10:35:34 +00:00
parent 0804aa70dc
commit 1fd35c1cf9
10 changed files with 119 additions and 125 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

25
clients/b2/b2client.cpp
View file

@ -36,7 +36,6 @@
#include <qbitmap.h> #include <qbitmap.h>
#include <qlabel.h> #include <qlabel.h>
#include <qtooltip.h> #include <qtooltip.h>
#include <kpixmap.h>
#include <X11/Xlib.h> #include <X11/Xlib.h>
#include <QX11Info> #include <QX11Info>
@ -59,7 +58,7 @@ enum {
#define NUM_PIXMAPS (P_NUM_BUTTON_TYPES * NumStates) #define NUM_PIXMAPS (P_NUM_BUTTON_TYPES * NumStates)
static KPixmap *pixmap[NUM_PIXMAPS]; static QPixmap *pixmap[NUM_PIXMAPS];
// active // active
#define PIXMAP_A(i) (pixmap[(i) * NumStates + Norm]) #define PIXMAP_A(i) (pixmap[(i) * NumStates + Norm])
@ -74,7 +73,7 @@ static KPixmap *pixmap[NUM_PIXMAPS];
// inactive, down // inactive, down
#define PIXMAP_ID(i) (pixmap[(i) * NumStates + IDown]) #define PIXMAP_ID(i) (pixmap[(i) * NumStates + IDown])
static KPixmap* titleGradient[2] = {0, 0}; static QPixmap* titleGradient[2] = {0, 0};
static int thickness = 4; // Frame thickness static int thickness = 4; // Frame thickness
static int buttonSize = 16; static int buttonSize = 16;
@ -154,7 +153,7 @@ static void read_config(B2ClientFactory *f)
} }
} }
static void drawB2Rect(KPixmap *pix, const QColor &primary, bool down) static void drawB2Rect(QPixmap *pix, const QColor &primary, bool down)
{ {
QPainter p(pix); QPainter p(pix);
QColor hColor = primary.light(150); QColor hColor = primary.light(150);
@ -201,17 +200,17 @@ static void create_pixmaps()
switch (i / NumStates) { switch (i / NumStates) {
case P_MAX: // will be initialized by copying P_CLOSE case P_MAX: // will be initialized by copying P_CLOSE
case P_RESIZE: case P_RESIZE:
pixmap[i] = new KPixmap(); pixmap[i] = new QPixmap();
break; break;
case P_ICONIFY: case P_ICONIFY:
pixmap[i] = new KPixmap(10, 10); pixmap[i] = new QPixmap(10, 10);
break; break;
case P_SHADE: case P_SHADE:
case P_CLOSE: case P_CLOSE:
pixmap[i] = new KPixmap(bsize, bsize); pixmap[i] = new QPixmap(bsize, bsize);
break; break;
default: default:
pixmap[i] = new KPixmap(16, 16); pixmap[i] = new QPixmap(16, 16);
break; break;
} }
} }
@ -968,11 +967,11 @@ static void redraw_pixmaps()
drawB2Rect(PIXMAP_ID(P_CLOSE), iGrp.color( QPalette::Button ), true); drawB2Rect(PIXMAP_ID(P_CLOSE), iGrp.color( QPalette::Button ), true);
// shade // shade
KPixmap thinBox(buttonSize - 2, 6); QPixmap thinBox(buttonSize - 2, 6);
for (i = 0; i < NumStates; i++) { for (i = 0; i < NumStates; i++) {
bool is_act = (i < 2); bool is_act = (i < 2);
bool is_down = ((i & 1) == 1); bool is_down = ((i & 1) == 1);
KPixmap *pix = pixmap[P_SHADE * NumStates + i]; QPixmap *pix = pixmap[P_SHADE * NumStates + i];
QColor color = is_act ? aGrp.color( QPalette::Button ) : iGrp.color( QPalette::Button ); QColor color = is_act ? aGrp.color( QPalette::Button ) : iGrp.color( QPalette::Button );
drawB2Rect(&thinBox, color, is_down); drawB2Rect(&thinBox, color, is_down);
pix->fill(Qt::black); pix->fill(Qt::black);
@ -987,8 +986,8 @@ static void redraw_pixmaps()
} }
// normalize + iconify // normalize + iconify
KPixmap smallBox( 10, 10 ); QPixmap smallBox( 10, 10 );
KPixmap largeBox( 12, 12 ); QPixmap largeBox( 12, 12 );
for (i = 0; i < NumStates; i++) { for (i = 0; i < NumStates; i++) {
bool is_act = (i < 3); bool is_act = (i < 3);
@ -1087,7 +1086,7 @@ static void redraw_pixmaps()
for (i = 0; i < 2; i++) { for (i = 0; i < 2; i++) {
if (titleColor[2 * i] != titleColor[2 * i + 1]) { if (titleColor[2 * i] != titleColor[2 * i + 1]) {
if (!titleGradient[i]) { if (!titleGradient[i]) {
titleGradient[i] = new KPixmap; titleGradient[i] = new QPixmap;
} }
*titleGradient[i] = QPixmap(64, buttonSize + 3); *titleGradient[i] = QPixmap(64, buttonSize + 3);
KPixmapEffect::gradient(*titleGradient[i], KPixmapEffect::gradient(*titleGradient[i],

86
clients/default/kdedefault.cpp
View file

@ -26,7 +26,7 @@
#include <qapplication.h> #include <qapplication.h>
#include <qlabel.h> #include <qlabel.h>
#include <kdebug.h> #include <kdebug.h>
#include <kpixmap.h> #include <QPixmap>
#include <QPolygon> #include <QPolygon>
#include <QStyle> #include <QStyle>
@ -119,25 +119,25 @@ static const unsigned char pinup_mask_bits[] = {
// =========================================================================== // ===========================================================================
static KPixmap* titlePix; static QPixmap* titlePix;
static KPixmap* titleBuffer; static QPixmap* titleBuffer;
static KPixmap* aUpperGradient; static QPixmap* aUpperGradient;
static KPixmap* iUpperGradient; static QPixmap* iUpperGradient;
static KPixmap* pinDownPix; static QPixmap* pinDownPix;
static KPixmap* pinUpPix; static QPixmap* pinUpPix;
static KPixmap* ipinDownPix; static QPixmap* ipinDownPix;
static KPixmap* ipinUpPix; static QPixmap* ipinUpPix;
static KPixmap* rightBtnUpPix[2]; static QPixmap* rightBtnUpPix[2];
static KPixmap* rightBtnDownPix[2]; static QPixmap* rightBtnDownPix[2];
static KPixmap* irightBtnUpPix[2]; static QPixmap* irightBtnUpPix[2];
static KPixmap* irightBtnDownPix[2]; static QPixmap* irightBtnDownPix[2];
static KPixmap* leftBtnUpPix[2]; static QPixmap* leftBtnUpPix[2];
static KPixmap* leftBtnDownPix[2]; static QPixmap* leftBtnDownPix[2];
static KPixmap* ileftBtnUpPix[2]; static QPixmap* ileftBtnUpPix[2];
static KPixmap* ileftBtnDownPix[2]; static QPixmap* ileftBtnDownPix[2];
static KDEDefaultHandler* clientHandler; static KDEDefaultHandler* clientHandler;
static int toolTitleHeight; static int toolTitleHeight;
@ -268,7 +268,7 @@ void KDEDefaultHandler::createPixmaps()
QPainter p; QPainter p;
QPainter maskPainter; QPainter maskPainter;
int i, x, y; int i, x, y;
titlePix = new KPixmap(132, normalTitleHeight+2); titlePix = new QPixmap(132, normalTitleHeight+2);
QBitmap mask(132, normalTitleHeight+2); QBitmap mask(132, normalTitleHeight+2);
mask.fill(Qt::color0); mask.fill(Qt::color0);
@ -306,7 +306,7 @@ void KDEDefaultHandler::createPixmaps()
// Create the titlebar gradients // Create the titlebar gradients
if (activeTitleColor1 != activeTitleColor2) if (activeTitleColor1 != activeTitleColor2)
{ {
aUpperGradient = new KPixmap(128, normalTitleHeight+2); aUpperGradient = new QPixmap(128, normalTitleHeight+2);
KPixmapEffect::gradient(*aUpperGradient, KPixmapEffect::gradient(*aUpperGradient,
activeTitleColor1, activeTitleColor1,
activeTitleColor2, activeTitleColor2,
@ -315,7 +315,7 @@ void KDEDefaultHandler::createPixmaps()
if (inactiveTitleColor1 != inactiveTitleColor2) if (inactiveTitleColor1 != inactiveTitleColor2)
{ {
iUpperGradient = new KPixmap(128, normalTitleHeight+2); iUpperGradient = new QPixmap(128, normalTitleHeight+2);
KPixmapEffect::gradient(*iUpperGradient, KPixmapEffect::gradient(*iUpperGradient,
inactiveTitleColor1, inactiveTitleColor1,
@ -330,14 +330,14 @@ void KDEDefaultHandler::createPixmaps()
// Active pins // Active pins
g = options()->palette( ColorButtonBg, true ); g = options()->palette( ColorButtonBg, true );
pinUpPix = new KPixmap(16, 16); pinUpPix = new QPixmap(16, 16);
p.begin( pinUpPix ); p.begin( pinUpPix );
kColorBitmaps( &p, g, 0, 0, 16, 16, true, pinup_white_bits, kColorBitmaps( &p, g, 0, 0, 16, 16, true, pinup_white_bits,
pinup_gray_bits, NULL, NULL, pinup_dgray_bits, NULL ); pinup_gray_bits, NULL, NULL, pinup_dgray_bits, NULL );
p.end(); p.end();
pinUpPix->setMask( QBitmap::fromData(QSize( 16, 16 ), pinup_mask_bits) ); pinUpPix->setMask( QBitmap::fromData(QSize( 16, 16 ), pinup_mask_bits) );
pinDownPix = new KPixmap(16, 16); pinDownPix = new QPixmap(16, 16);
p.begin( pinDownPix ); p.begin( pinDownPix );
kColorBitmaps( &p, g, 0, 0, 16, 16, true, pindown_white_bits, kColorBitmaps( &p, g, 0, 0, 16, 16, true, pindown_white_bits,
pindown_gray_bits, NULL, NULL, pindown_dgray_bits, NULL ); pindown_gray_bits, NULL, NULL, pindown_dgray_bits, NULL );
@ -346,14 +346,14 @@ void KDEDefaultHandler::createPixmaps()
// Inactive pins // Inactive pins
g = options()->palette( ColorButtonBg, false ); g = options()->palette( ColorButtonBg, false );
ipinUpPix = new KPixmap(16, 16); ipinUpPix = new QPixmap(16, 16);
p.begin( ipinUpPix ); p.begin( ipinUpPix );
kColorBitmaps( &p, g, 0, 0, 16, 16, true, pinup_white_bits, kColorBitmaps( &p, g, 0, 0, 16, 16, true, pinup_white_bits,
pinup_gray_bits, NULL, NULL, pinup_dgray_bits, NULL ); pinup_gray_bits, NULL, NULL, pinup_dgray_bits, NULL );
p.end(); p.end();
ipinUpPix->setMask( QBitmap::fromData(QSize( 16, 16 ), pinup_mask_bits) ); ipinUpPix->setMask( QBitmap::fromData(QSize( 16, 16 ), pinup_mask_bits) );
ipinDownPix = new KPixmap(16, 16); ipinDownPix = new QPixmap(16, 16);
p.begin( ipinDownPix ); p.begin( ipinDownPix );
kColorBitmaps( &p, g, 0, 0, 16, 16, true, pindown_white_bits, kColorBitmaps( &p, g, 0, 0, 16, 16, true, pindown_white_bits,
pindown_gray_bits, NULL, NULL, pindown_dgray_bits, NULL ); pindown_gray_bits, NULL, NULL, pindown_dgray_bits, NULL );
@ -361,28 +361,28 @@ void KDEDefaultHandler::createPixmaps()
ipinDownPix->setMask( QBitmap::fromData(QSize( 16, 16 ), pindown_mask_bits) ); ipinDownPix->setMask( QBitmap::fromData(QSize( 16, 16 ), pindown_mask_bits) );
// Create a title buffer for flicker-free painting // Create a title buffer for flicker-free painting
titleBuffer = new KPixmap(); titleBuffer = new QPixmap();
// Cache all possible button states // Cache all possible button states
leftBtnUpPix[true] = new KPixmap(normalTitleHeight, normalTitleHeight); leftBtnUpPix[true] = new QPixmap(normalTitleHeight, normalTitleHeight);
leftBtnDownPix[true] = new KPixmap(normalTitleHeight, normalTitleHeight); leftBtnDownPix[true] = new QPixmap(normalTitleHeight, normalTitleHeight);
ileftBtnUpPix[true] = new KPixmap(normalTitleHeight, normalTitleHeight); ileftBtnUpPix[true] = new QPixmap(normalTitleHeight, normalTitleHeight);
ileftBtnDownPix[true] = new KPixmap(normalTitleHeight, normalTitleHeight); ileftBtnDownPix[true] = new QPixmap(normalTitleHeight, normalTitleHeight);
rightBtnUpPix[true] = new KPixmap(normalTitleHeight, normalTitleHeight); rightBtnUpPix[true] = new QPixmap(normalTitleHeight, normalTitleHeight);
rightBtnDownPix[true] = new KPixmap(normalTitleHeight, normalTitleHeight); rightBtnDownPix[true] = new QPixmap(normalTitleHeight, normalTitleHeight);
irightBtnUpPix[true] = new KPixmap(normalTitleHeight, normalTitleHeight); irightBtnUpPix[true] = new QPixmap(normalTitleHeight, normalTitleHeight);
irightBtnDownPix[true] = new KPixmap(normalTitleHeight, normalTitleHeight); irightBtnDownPix[true] = new QPixmap(normalTitleHeight, normalTitleHeight);
leftBtnUpPix[false] = new KPixmap(toolTitleHeight, normalTitleHeight); leftBtnUpPix[false] = new QPixmap(toolTitleHeight, normalTitleHeight);
leftBtnDownPix[false] = new KPixmap(toolTitleHeight, normalTitleHeight); leftBtnDownPix[false] = new QPixmap(toolTitleHeight, normalTitleHeight);
ileftBtnUpPix[false] = new KPixmap(normalTitleHeight, normalTitleHeight); ileftBtnUpPix[false] = new QPixmap(normalTitleHeight, normalTitleHeight);
ileftBtnDownPix[false] = new KPixmap(normalTitleHeight, normalTitleHeight); ileftBtnDownPix[false] = new QPixmap(normalTitleHeight, normalTitleHeight);
rightBtnUpPix[false] = new KPixmap(toolTitleHeight, toolTitleHeight); rightBtnUpPix[false] = new QPixmap(toolTitleHeight, toolTitleHeight);
rightBtnDownPix[false] = new KPixmap(toolTitleHeight, toolTitleHeight); rightBtnDownPix[false] = new QPixmap(toolTitleHeight, toolTitleHeight);
irightBtnUpPix[false] = new KPixmap(toolTitleHeight, toolTitleHeight); irightBtnUpPix[false] = new QPixmap(toolTitleHeight, toolTitleHeight);
irightBtnDownPix[false] = new KPixmap(toolTitleHeight, toolTitleHeight); irightBtnDownPix[false] = new QPixmap(toolTitleHeight, toolTitleHeight);
// Draw the button state pixmaps // Draw the button state pixmaps
g = options()->palette( ColorTitleBar, true ); g = options()->palette( ColorTitleBar, true );
@ -472,7 +472,7 @@ void KDEDefaultHandler::freePixmaps()
} }
void KDEDefaultHandler::drawButtonBackground(KPixmap *pix, void KDEDefaultHandler::drawButtonBackground(QPixmap *pix,
const QPalette &g, bool sunken) const QPalette &g, bool sunken)
{ {
QPainter p; QPainter p;
@ -677,7 +677,7 @@ void KDEDefaultButton::drawButton(QPainter *p)
p->drawPixmap(isDown() ? xOff+1: xOff, isDown() ? yOff+1 : yOff, *deco); p->drawPixmap(isDown() ? xOff+1: xOff, isDown() ? yOff+1 : yOff, *deco);
} else { } else {
KPixmap btnpix; QPixmap btnpix;
if (type()==OnAllDesktopsButton) { if (type()==OnAllDesktopsButton) {
if (active) if (active)

4
clients/default/kdedefault.h
View file

@ -21,7 +21,7 @@
class QSpacerItem; class QSpacerItem;
class QBoxLayout; class QBoxLayout;
class QGridLayout; class QGridLayout;
class KPixmap; class QPixmap;
namespace Default { namespace Default {
@ -41,7 +41,7 @@ class KDEDefaultHandler: public KDecorationFactory
unsigned long readConfig( bool update ); unsigned long readConfig( bool update );
void createPixmaps(); void createPixmaps();
void freePixmaps(); void freePixmaps();
void drawButtonBackground(KPixmap *pix, void drawButtonBackground(QPixmap *pix,
const QPalette &g, bool sunken); const QPalette &g, bool sunken);
}; };

43
clients/laptop/laptopclient.cpp
View file

@ -13,7 +13,6 @@
#include <QPixmap> #include <QPixmap>
#include <QPaintEvent> #include <QPaintEvent>
#include <kpixmapeffect.h> #include <kpixmapeffect.h>
#include <kpixmap.h>
#include <kdrawutil.h> #include <kdrawutil.h>
#include <kglobal.h> #include <kglobal.h>
#include <klocale.h> #include <klocale.h>
@ -46,17 +45,17 @@ static const unsigned char sticky_bits[] = {
0x3c, 0x42, 0x81, 0x81, 0x81, 0x81, 0x42, 0x3c}; 0x3c, 0x42, 0x81, 0x81, 0x81, 0x81, 0x42, 0x3c};
static QPixmap *titlePix; static QPixmap *titlePix;
static KPixmap *aUpperGradient; static QPixmap *aUpperGradient;
static KPixmap *iUpperGradient; static QPixmap *iUpperGradient;
// buttons active, inactive, up, down, and 2 sizes :P // buttons active, inactive, up, down, and 2 sizes :P
static KPixmap *btnPix1; static QPixmap *btnPix1;
static KPixmap *iBtnPix1; static QPixmap *iBtnPix1;
static KPixmap *btnDownPix1; static QPixmap *btnDownPix1;
static KPixmap *iBtnDownPix1; static QPixmap *iBtnDownPix1;
static KPixmap *btnPix2; static QPixmap *btnPix2;
static KPixmap *btnDownPix2; static QPixmap *btnDownPix2;
static KPixmap *iBtnPix2; static QPixmap *iBtnPix2;
static KPixmap *iBtnDownPix2; static QPixmap *iBtnDownPix2;
static QColor btnForeground; static QColor btnForeground;
static int titleHeight = 14; static int titleHeight = 14;
@ -81,7 +80,7 @@ static inline const KDecorationOptions* options()
return KDecoration::options(); return KDecoration::options();
} }
static void drawButtonFrame(KPixmap *pix, const QPalette &g, bool sunken) static void drawButtonFrame(QPixmap *pix, const QPalette &g, bool sunken)
{ {
QPainter p; QPainter p;
int w = pix->width(); int w = pix->width();
@ -145,8 +144,8 @@ static void create_pixmaps()
titlePix->setMask(mask); titlePix->setMask(mask);
if(QPixmap::defaultDepth() > 8){ if(QPixmap::defaultDepth() > 8){
aUpperGradient = new KPixmap(32, titleHeight+2); aUpperGradient = new QPixmap(32, titleHeight+2);
iUpperGradient = new KPixmap(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, KPixmapEffect::gradient(*aUpperGradient,
bgColor.light(120), bgColor.light(120),
@ -162,14 +161,14 @@ static void create_pixmaps()
QPalette g = options()->palette(KDecoration::ColorButtonBg, true); QPalette g = options()->palette(KDecoration::ColorButtonBg, true);
g.setCurrentColorGroup( QPalette::Active ); g.setCurrentColorGroup( QPalette::Active );
QColor c = g.color( QPalette::Background ); QColor c = g.color( QPalette::Background );
btnPix1 = new KPixmap(btnWidth1, titleHeight); btnPix1 = new QPixmap(btnWidth1, titleHeight);
btnDownPix1 = new KPixmap(btnWidth1, titleHeight); btnDownPix1 = new QPixmap(btnWidth1, titleHeight);
btnPix2 = new KPixmap(btnWidth2, titleHeight); btnPix2 = new QPixmap(btnWidth2, titleHeight);
btnDownPix2 = new KPixmap(btnWidth2, titleHeight); btnDownPix2 = new QPixmap(btnWidth2, titleHeight);
iBtnPix1 = new KPixmap(btnWidth1, titleHeight); iBtnPix1 = new QPixmap(btnWidth1, titleHeight);
iBtnDownPix1 = new KPixmap(btnWidth1, titleHeight); iBtnDownPix1 = new QPixmap(btnWidth1, titleHeight);
iBtnPix2 = new KPixmap(btnWidth2, titleHeight); iBtnPix2 = new QPixmap(btnWidth2, titleHeight);
iBtnDownPix2 = new KPixmap(btnWidth2, titleHeight); iBtnDownPix2 = new QPixmap(btnWidth2, titleHeight);
if(QPixmap::defaultDepth() > 8){ if(QPixmap::defaultDepth() > 8){
KPixmapEffect::gradient(*btnPix1, c.light(120), c.dark(130), KPixmapEffect::gradient(*btnPix1, c.light(120), c.dark(130),
KPixmapEffect::DiagonalGradient); KPixmapEffect::DiagonalGradient);

9
clients/modernsystem/modernsys.cpp
View file

@ -10,7 +10,6 @@
#include <QPixmap> #include <QPixmap>
#include <QPaintEvent> #include <QPaintEvent>
#include <kpixmapeffect.h> #include <kpixmapeffect.h>
#include <kpixmap.h>
#include <kdrawutil.h> #include <kdrawutil.h>
#include <qbitmap.h> #include <qbitmap.h>
#include <qtooltip.h> #include <qtooltip.h>
@ -75,8 +74,8 @@ static unsigned char btnhighcolor_mask_bits[] = {
0x00,0x40,0x80,0x00,0x00,0x00,0x39,0x00,0x00,0x00,0x20,0x99,0x0f,0x08,0xc4, 0x00,0x40,0x80,0x00,0x00,0x00,0x39,0x00,0x00,0x00,0x20,0x99,0x0f,0x08,0xc4,
0x00,0x00,0x00,0x67,0x00,0x00,0x00,0x58,0x5f,0x43,0x68,0x61,0x6e,0x67,0x65 }; 0x00,0x00,0x00,0x67,0x00,0x00,0x00,0x58,0x5f,0x43,0x68,0x61,0x6e,0x67,0x65 };
static KPixmap *aUpperGradient=0; static QPixmap *aUpperGradient=0;
static KPixmap *iUpperGradient=0; static QPixmap *iUpperGradient=0;
static QPixmap *buttonPix=0; static QPixmap *buttonPix=0;
static QPixmap *buttonPixDown=0; static QPixmap *buttonPixDown=0;
static QPixmap *iButtonPix=0; static QPixmap *iButtonPix=0;
@ -161,8 +160,8 @@ static void create_pixmaps()
btnSource = new QImage(btnhighcolor_xpm); btnSource = new QImage(btnhighcolor_xpm);
if(QPixmap::defaultDepth() > 8){ if(QPixmap::defaultDepth() > 8){
aUpperGradient = new KPixmap( 32, title_height+2 ); aUpperGradient = new QPixmap( 32, title_height+2 );
iUpperGradient = new KPixmap( 32, title_height+2);; iUpperGradient = new QPixmap( 32, title_height+2);;
KPixmapEffect::gradient(*aUpperGradient, KPixmapEffect::gradient(*aUpperGradient,
options()->color(KDecoration::ColorTitleBar, true).light(130), options()->color(KDecoration::ColorTitleBar, true).light(130),
options()->color(KDecoration::ColorTitleBlend, true), options()->color(KDecoration::ColorTitleBlend, true),

6
clients/plastik/plastik.cpp
View file

@ -25,7 +25,7 @@
#include <qimage.h> #include <qimage.h>
#include <kconfig.h> #include <kconfig.h>
#include <kpixmap.h> #include <QPixmap>
#include <kpixmapeffect.h> #include <kpixmapeffect.h>
#include "misc.h" #include "misc.h"
@ -240,9 +240,9 @@ const QPixmap &PlastikHandler::pixmap(Pixmaps type, bool active, bool toolWindow
const int titleBarTileHeight = (toolWindow ? m_titleHeightTool : m_titleHeight) + 2; const int titleBarTileHeight = (toolWindow ? m_titleHeightTool : m_titleHeight) + 2;
// gradient used as well in TitleBarTileTop as TitleBarTile // gradient used as well in TitleBarTileTop as TitleBarTile
const int gradientHeight = 2 + titleBarTileHeight-1; const int gradientHeight = 2 + titleBarTileHeight-1;
KPixmap gradient(1, gradientHeight); QPixmap gradient(1, gradientHeight);
QPainter painter(&gradient); QPainter painter(&gradient);
KPixmap tempPixmap( 1, 4 ); QPixmap tempPixmap( 1, 4 );
KPixmapEffect::gradient(tempPixmap, KPixmapEffect::gradient(tempPixmap,
getColor(TitleGradient1, active), getColor(TitleGradient1, active),
getColor(TitleGradient2, active), getColor(TitleGradient2, active),

3
clients/plastik/plastikbutton.cpp
View file

@ -28,7 +28,6 @@
#include <qpainter.h> #include <qpainter.h>
#include <qpixmap.h> #include <qpixmap.h>
#include <kpixmapeffect.h> #include <kpixmapeffect.h>
#include <kpixmap.h>
#include <qtimer.h> #include <qtimer.h>
#include "plastikbutton.h" #include "plastikbutton.h"
@ -173,7 +172,7 @@ void PlastikButton::drawButton(QPainter *painter)
QRect r(0,0,width(),height()); QRect r(0,0,width(),height());
bool active = m_client->isActive(); bool active = m_client->isActive();
KPixmap tempPixmap; QPixmap tempPixmap;
QColor highlightColor; QColor highlightColor;
if(type() == CloseButton) { if(type() == CloseButton) {

27
clients/quartz/quartz.cpp
View file

@ -22,7 +22,6 @@
#include <qbitmap.h> #include <qbitmap.h>
#include <qdrawutil.h> #include <qdrawutil.h>
#include <qimage.h> #include <qimage.h>
#include <kpixmap.h>
#include <qapplication.h> #include <qapplication.h>
#include "quartz.h" #include "quartz.h"
@ -115,12 +114,12 @@ bool onAllDesktopsButtonOnLeft = true;
bool coloredFrame = true; bool coloredFrame = true;
bool extraSlim = false; bool extraSlim = false;
KPixmap* titleBlocks = NULL; QPixmap* titleBlocks = NULL;
KPixmap* ititleBlocks = NULL; QPixmap* ititleBlocks = NULL;
KPixmap* pinDownPix = NULL; QPixmap* pinDownPix = NULL;
KPixmap* pinUpPix = NULL; QPixmap* pinUpPix = NULL;
KPixmap* ipinDownPix = NULL; QPixmap* ipinDownPix = NULL;
KPixmap* ipinUpPix = NULL; QPixmap* ipinUpPix = NULL;
static int normalTitleHeight; static int normalTitleHeight;
static int toolTitleHeight; static int toolTitleHeight;
static int borderWidth; static int borderWidth;
@ -250,7 +249,7 @@ void QuartzHandler::readConfig()
// This does the colour transition magic. (You say "Oh, is that it?") // This does the colour transition magic. (You say "Oh, is that it?")
// This may be made configurable at a later stage // This may be made configurable at a later stage
void QuartzHandler::drawBlocks( KPixmap *pi, KPixmap &p, const QColor &c1, const QColor &c2 ) void QuartzHandler::drawBlocks( QPixmap *pi, QPixmap &p, const QColor &c1, const QColor &c2 )
{ {
QPainter px; QPainter px;
@ -302,7 +301,7 @@ void QuartzHandler::createPixmaps()
g2.setCurrentColorGroup( QPalette::Active ); g2.setCurrentColorGroup( QPalette::Active );
QColor c = g2.color(QPalette::Background).light(130); QColor c = g2.color(QPalette::Background).light(130);
titleBlocks = new KPixmap( normalTitleHeight*25/18, normalTitleHeight ); titleBlocks = new QPixmap( normalTitleHeight*25/18, normalTitleHeight );
drawBlocks( titleBlocks, *titleBlocks, c, c2 ); drawBlocks( titleBlocks, *titleBlocks, c, c2 );
g2 = options()->palette(ColorTitleBlend, false); g2 = options()->palette(ColorTitleBlend, false);
@ -312,7 +311,7 @@ void QuartzHandler::createPixmaps()
g2.setCurrentColorGroup( QPalette::Active ); g2.setCurrentColorGroup( QPalette::Active );
c = g2.color(QPalette::Background).light(130); c = g2.color(QPalette::Background).light(130);
ititleBlocks = new KPixmap( normalTitleHeight*25/18, normalTitleHeight ); ititleBlocks = new QPixmap( normalTitleHeight*25/18, normalTitleHeight );
drawBlocks( ititleBlocks, *ititleBlocks, c, c2 ); drawBlocks( ititleBlocks, *ititleBlocks, c, c2 );
// Set the on all desktops pin pixmaps; // Set the on all desktops pin pixmaps;
@ -325,14 +324,14 @@ void QuartzHandler::createPixmaps()
g2 = options()->palette( ColorButtonBg, true ); g2 = options()->palette( ColorButtonBg, true );
g2.setCurrentColorGroup( QPalette::Active ); g2.setCurrentColorGroup( QPalette::Active );
pinUpPix = new KPixmap(16, 16); pinUpPix = new QPixmap(16, 16);
p.begin( pinUpPix ); p.begin( pinUpPix );
p.fillRect( 0, 0, 16, 16, c); p.fillRect( 0, 0, 16, 16, c);
kColorBitmaps( &p, g2, 0, 1, 16, 16, true, pinup_white_bits, kColorBitmaps( &p, g2, 0, 1, 16, 16, true, pinup_white_bits,
pinup_gray_bits, NULL, NULL, pinup_dgray_bits, NULL ); pinup_gray_bits, NULL, NULL, pinup_dgray_bits, NULL );
p.end(); p.end();
pinDownPix = new KPixmap(16, 16); pinDownPix = new QPixmap(16, 16);
p.begin( pinDownPix ); p.begin( pinDownPix );
p.fillRect( 0, 0, 16, 16, c); p.fillRect( 0, 0, 16, 16, c);
kColorBitmaps( &p, g2, 0, 1, 16, 16, true, pindown_white_bits, kColorBitmaps( &p, g2, 0, 1, 16, 16, true, pindown_white_bits,
@ -347,14 +346,14 @@ void QuartzHandler::createPixmaps()
g2 = options()->palette( ColorButtonBg, false ); g2 = options()->palette( ColorButtonBg, false );
g2.setCurrentColorGroup( QPalette::Active ); g2.setCurrentColorGroup( QPalette::Active );
ipinUpPix = new KPixmap(16, 16); ipinUpPix = new QPixmap(16, 16);
p.begin( ipinUpPix ); p.begin( ipinUpPix );
p.fillRect( 0, 0, 16, 16, c); p.fillRect( 0, 0, 16, 16, c);
kColorBitmaps( &p, g2, 0, 1, 16, 16, true, pinup_white_bits, kColorBitmaps( &p, g2, 0, 1, 16, 16, true, pinup_white_bits,
pinup_gray_bits, NULL, NULL, pinup_dgray_bits, NULL ); pinup_gray_bits, NULL, NULL, pinup_dgray_bits, NULL );
p.end(); p.end();
ipinDownPix = new KPixmap(16, 16); ipinDownPix = new QPixmap(16, 16);
p.begin( ipinDownPix ); p.begin( ipinDownPix );
p.fillRect( 0, 0, 16, 16, c); p.fillRect( 0, 0, 16, 16, c);
kColorBitmaps( &p, g2, 0, 1, 16, 16, true, pindown_white_bits, kColorBitmaps( &p, g2, 0, 1, 16, 16, true, pindown_white_bits,

2
clients/quartz/quartz.h
View file

@ -43,7 +43,7 @@ class QuartzHandler: public QObject, public KDecorationFactory
void readConfig(); void readConfig();
void createPixmaps(); void createPixmaps();
void freePixmaps(); void freePixmaps();
void drawBlocks(KPixmap* pi, KPixmap &p, const QColor &c1, const QColor &c2); void drawBlocks(QPixmap* pi, QPixmap &p, const QColor &c1, const QColor &c2);
}; };

39
clients/redmond/redmond.cpp
View file

@ -23,7 +23,6 @@
#include <kimageeffect.h> #include <kimageeffect.h>
#include <kdrawutil.h> #include <kdrawutil.h>
#include <klocale.h> #include <klocale.h>
#include <kpixmap.h>
#include <qbitmap.h> #include <qbitmap.h>
#include <qimage.h> #include <qimage.h>
@ -81,17 +80,17 @@ static unsigned char question_bits[] = {
// Up / Down titlebar button images // Up / Down titlebar button images
static KPixmap *btnPix1; static QPixmap *btnPix1;
static KPixmap *iBtnPix1; static QPixmap *iBtnPix1;
static KPixmap *btnDownPix1; static QPixmap *btnDownPix1;
static KPixmap *iBtnDownPix1; static QPixmap *iBtnDownPix1;
static KPixmap *miniBtnPix1; static QPixmap *miniBtnPix1;
static KPixmap *iMiniBtnPix1; static QPixmap *iMiniBtnPix1;
static KPixmap *miniBtnDownPix1; static QPixmap *miniBtnDownPix1;
static KPixmap *iMiniBtnDownPix1; static QPixmap *iMiniBtnDownPix1;
static KPixmap *defaultMenuPix; static QPixmap *defaultMenuPix;
static QColor *btnForeground; static QColor *btnForeground;
static bool pixmaps_created = false; static bool pixmaps_created = false;
@ -142,15 +141,15 @@ static void create_pixmaps ()
bool highcolor = QPixmap::defaultDepth() > 8; bool highcolor = QPixmap::defaultDepth() > 8;
btnPix1 = new KPixmap; btnPix1 = new QPixmap;
btnDownPix1 = new KPixmap; btnDownPix1 = new QPixmap;
iBtnPix1 = new KPixmap; iBtnPix1 = new QPixmap;
iBtnDownPix1 = new KPixmap; iBtnDownPix1 = new QPixmap;
miniBtnPix1 = new KPixmap; miniBtnPix1 = new QPixmap;
miniBtnDownPix1 = new KPixmap; miniBtnDownPix1 = new QPixmap;
iMiniBtnPix1 = new KPixmap; iMiniBtnPix1 = new QPixmap;
iMiniBtnDownPix1 = new KPixmap; iMiniBtnDownPix1 = new QPixmap;
defaultMenuPix = new KPixmap(kdelogo); defaultMenuPix = new QPixmap(kdelogo);
// buttons (active/inactive, sunken/unsunken) // buttons (active/inactive, sunken/unsunken)
QColorGroup g = options()->palette(KDecoration::ColorButtonBg, true).active(); QColorGroup g = options()->palette(KDecoration::ColorButtonBg, true).active();
@ -551,7 +550,7 @@ void RedmondDeco::paintEvent( QPaintEvent* )
// KS - Add gradient caching if needed at a later stage. // KS - Add gradient caching if needed at a later stage.
// Create a disposable pixmap buffer for the title blend // Create a disposable pixmap buffer for the title blend
KPixmap* titleBuffer = new KPixmap; QPixmap* titleBuffer = new QPixmap;
*titleBuffer = QPixmap(w-2*modBorderWidth, titleHeight); *titleBuffer = QPixmap(w-2*modBorderWidth, titleHeight);
if (titleBuffer->depth() > 16) { if (titleBuffer->depth() > 16) {