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

no need to fake the titlebar background except for the menu button

Browse source 
svn path=/trunk/kdebase/kwin/; revision=400268
This commit is contained in:
Sandro Giessl 2005-03-24 16:56:58 +00:00
parent b356373b1e
commit 33438df578
4 changed files with 20 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
clients/plastik/plastikbutton.cpp
View file

@ -1,5 +1,5 @@
/* Plastik KWin window decoration
Copyright (C) 2003 Sandro Giessl <ceebx@users.sourceforge.net>
Copyright (C) 2003-2005 Sandro Giessl <sandro@giessl.com>
based on the window decoration "Web":
Copyright (C) 2001 Rik Hemsley (rikkus) <rik@kde.org>
@ -23,13 +23,10 @@
// #include <kwin/options.h>
#include <qbitmap.h>
#include <qcursor.h>
#include <qimage.h>
#include <qpainter.h>
#include <qpixmap.h>
#include <kpixmap.h>
#include <kpixmapeffect.h>
#include <qtooltip.h>
#include <qtimer.h>
#include "plastikbutton.h"
@ -116,6 +113,14 @@ void PlastikButton::reset(unsigned long changed)
break;
}
// button mask
if (type() != MenuButton) {
QRegion mask(rect() );
mask -= QRegion(0,0,1,1) + QRegion(0,height()-1,1,1) +
QRegion(width()-1,0,1,1) + QRegion(width()-1,height()-1,1,1);
setMask(mask);
}
this->update();
}
}
@ -168,7 +173,6 @@ void PlastikButton::drawButton(QPainter *painter)
QRect r(0,0,width(),height());
bool active = m_client->isActive();
QPixmap backgroundTile = m_client->getTitleBarTile(active);
KPixmap tempKPixmap;
QColor highlightColor;
@ -205,8 +209,11 @@ void PlastikButton::drawButton(QPainter *painter)
buffer.resize(width(), height());
QPainter bP(&buffer);
// fill with the titlebar background
bP.drawTiledPixmap(0, 0, width(), width(), backgroundTile);
if (type() == MenuButton)
{
// fake the titlebar background
bP.drawTiledPixmap(0, 0, width(), width(), m_client->getTitleBarTile(active) );
}
if (type() != MenuButton || hover || animProgress != 0) {
// contour

2
clients/plastik/plastikbutton.h
View file

@ -1,5 +1,5 @@
/* Plastik KWin window decoration
Copyright (C) 2003 Sandro Giessl <ceebx@users.sourceforge.net>
Copyright (C) 2003-2005 Sandro Giessl <sandro@giessl.com>
based on the window decoration "Web":
Copyright (C) 2001 Rik Hemsley (rikkus) <rik@kde.org>

5
clients/plastik/plastikclient.cpp
View file

@ -1,5 +1,5 @@
/* Plastik KWin window decoration
Copyright (C) 2003 Sandro Giessl <ceebx@users.sourceforge.net>
Copyright (C) 2003-2005 Sandro Giessl <sandro@giessl.com>
based on the window decoration "Web":
Copyright (C) 2001 Rik Hemsley (rikkus) <rik@kde.org>
@ -21,9 +21,6 @@
*/
#include <klocale.h>
#include <kpixmap.h>
#include <kpixmapeffect.h>
#include <kapplication.h>
#include <qbitmap.h>
#include <qdatetime.h>

8
clients/plastik/plastikclient.h
View file

@ -1,5 +1,5 @@
/* Plastik KWin window decoration
Copyright (C) 2003 Sandro Giessl <ceebx@users.sourceforge.net>
Copyright (C) 2003-2005 Sandro Giessl <sandro@giessl.com>
based on the window decoration "Web":
Copyright (C) 2001 Rik Hemsley (rikkus) <rik@kde.org>
@ -20,8 +20,8 @@
Boston, MA 02111-1307, USA.
*/
#ifndef KNIFTYCLIENT_H
#define KNIFTYCLIENT_H
#ifndef PLASTIKCLIENT_H
#define PLASTIKCLIENT_H
#include <kcommondecoration.h>
@ -70,4 +70,4 @@ private:
} // KWinPlastik
#endif // KNIFTCLIENT_H
#endif // PLASTIKCLIENT_H