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

rid ourselves of the Q3Buttons

Browse source 
svn path=/trunk/KDE/kdebase/kwin/; revision=449967
This commit is contained in:
Matt Broadstone 2005-08-17 09:15:59 +00:00
parent 8f209fb84f
commit 5da7024486
16 changed files with 61 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
clients/default/kdedefault.cpp
View file

@ -625,6 +625,11 @@ void KDEDefaultButton::setBitmap(const unsigned char *bitmap)
}
}
void KDEDefaultButton::paintEvent(QPaintEvent *)
{
QPainter p(this);
drawButton(&p);
}
void KDEDefaultButton::drawButton(QPainter *p)
{

1
clients/default/kdedefault.h
View file

@ -60,6 +60,7 @@ class KDEDefaultButton : public KCommonDecorationButton
protected:
void enterEvent(QEvent *);
void leaveEvent(QEvent *);
void paintEvent(QPaintEvent *);
void drawButton(QPainter *p);
void drawButtonLabel(QPainter*) {;}

6
clients/laptop/laptopclient.cpp
View file

@ -299,6 +299,12 @@ void LaptopButton::setBitmap(const unsigned char *bitmap)
repaint();
}
void LaptopButton::paintEvent(QPaintEvent *)
{
QPainter p(this);
drawButton(&p);
}
void LaptopButton::drawButton(QPainter *p)
{
bool smallBtn = width() == btnWidth1;

1
clients/laptop/laptopclient.h
View file

@ -24,6 +24,7 @@ public:
virtual void reset(unsigned long changed);
protected:
void paintEvent(QPaintEvent *);
virtual void drawButton(QPainter *p);
QBitmap deco;
};

6
clients/modernsystem/modernsys.cpp
View file

@ -350,6 +350,12 @@ void ModernButton::setBitmap(const unsigned char *bitmap)
deco.setMask(deco);
}
void ModernButton::paintEvent(QPaintEvent *)
{
QPainter p(this);
drawButton(&p);
}
void ModernButton::drawButton(QPainter *p)
{
if(decoration()->isActive()){

2
clients/modernsystem/modernsys.h
View file

@ -20,7 +20,7 @@ public:
void setBitmap(const unsigned char *bitmap);
virtual void reset(unsigned long changed);
protected:
void paintEvent(QPaintEvent *);
virtual void drawButton(QPainter *p);
void drawButtonLabel(QPainter *){;}
QBitmap deco;

12
clients/plastik/plastikbutton.cpp
View file

@ -22,7 +22,7 @@
// #include <kwin/options.h>
#include <Q3Button>
#include <QAbstractButton>
#include <qbitmap.h>
#include <qpainter.h>
#include <qpixmap.h>
@ -146,7 +146,7 @@ void PlastikButton::animate()
void PlastikButton::enterEvent(QEvent *e)
{
Q3Button::enterEvent(e);
QAbstractButton::enterEvent(e);
hover = true;
animate();
@ -154,12 +154,18 @@ void PlastikButton::enterEvent(QEvent *e)
void PlastikButton::leaveEvent(QEvent *e)
{
Q3Button::leaveEvent(e);
QAbstractButton::leaveEvent(e);
hover = false;
animate();
}
void PlastikButton::paintEvent(QPaintEvent *)
{
QPainter p(this);
drawButton(&p);
}
void PlastikButton::drawButton(QPainter *painter)
{
QRect r(0,0,width(),height());

3
clients/plastik/plastikbutton.h
View file

@ -47,6 +47,9 @@ public:
protected slots:
void animate();
protected:
void paintEvent(QPaintEvent *);
private:
void enterEvent(QEvent *e);
void leaveEvent(QEvent *e);

6
clients/quartz/quartz.cpp
View file

@ -444,6 +444,12 @@ void QuartzButton::setBitmap(const unsigned char *bitmap)
}
}
void QuartzButton::paintEvent(QPaintEvent *)
{
QPainter p(this);
drawButton(&p);
}
void QuartzButton::drawButton(QPainter *p)
{
// Never paint if the pixmaps have not been created

1
clients/quartz/quartz.h
View file

@ -58,6 +58,7 @@ class QuartzButton : public KCommonDecorationButton
void reset(unsigned long changed);
protected:
void paintEvent(QPaintEvent *);
void drawButton(QPainter *p);
QBitmap* deco;

5
clients/redmond/redmond.cpp
View file

@ -300,6 +300,11 @@ void RedmondButton::setPixmap( const QPixmap &p )
repaint(false);
}
void RedmondButton::paintEvent(QPaintEvent *)
{
QPainter p(this);
drawButton(&p);
}
void RedmondButton::drawButton(QPainter *p)
{

1
clients/redmond/redmond.h
View file

@ -37,6 +37,7 @@ public:
void reset(unsigned long changed);
protected:
void paintEvent(QPaintEvent *);
virtual void drawButton(QPainter *p);
void drawButtonLabel(QPainter *){;}

10
clients/web/WebButton.cpp
View file

@ -130,7 +130,7 @@ WebButton::enterEvent(QEvent * e)
{
mouseOver_ = true;
repaint();
Q3Button::enterEvent(e);
QAbstractButton::enterEvent(e);
}
void
@ -138,7 +138,13 @@ WebButton::leaveEvent(QEvent * e)
{
mouseOver_ = false;
repaint();
Q3Button::leaveEvent(e);
QAbstractButton::leaveEvent(e);
}
void WebButton::paintEvent(QPaintEvent *)
{
QPainter p(this);
drawButton(&p);
}
void

1
clients/web/WebButton.h
View file

@ -52,6 +52,7 @@ namespace Web
void enterEvent(QEvent *);
void leaveEvent(QEvent *);
void paintEvent(QPaintEvent *);
void drawButton(QPainter *p);
private:

10
lib/kcommondecoration.cpp
View file

@ -872,7 +872,7 @@ QRect KCommonDecoration::titleRect() const
KCommonDecorationButton::KCommonDecorationButton(ButtonType type, KCommonDecoration *parent, const char *name)
: Q3Button(parent->widget(), name),
: QAbstractButton(parent->widget(), name),
m_decoration(parent),
m_type(type),
m_realizeButtons(Qt::LeftButton),
@ -933,14 +933,14 @@ void KCommonDecorationButton::setTipText(const QString &tip) {
void KCommonDecorationButton::setToggleButton(bool toggle)
{
Q3Button::setToggleButton(toggle);
QAbstractButton::setToggleButton(toggle);
reset(ToggleChange);
}
void KCommonDecorationButton::setOn(bool on)
{
if (on != isOn() ) {
Q3Button::setOn(on);
QAbstractButton::setOn(on);
reset(StateChange);
}
}
@ -952,7 +952,7 @@ void KCommonDecorationButton::mousePressEvent(QMouseEvent* e)
QMouseEvent me(e->type(), e->pos(), e->globalPos(),
(e->button()&m_realizeButtons)?Qt::LeftButton : Qt::NoButton, e->state());
Q3Button::mousePressEvent(&me);
QAbstractButton::mousePressEvent(&me);
}
void KCommonDecorationButton::mouseReleaseEvent(QMouseEvent* e)
@ -962,5 +962,5 @@ void KCommonDecorationButton::mouseReleaseEvent(QMouseEvent* e)
QMouseEvent me(e->type(), e->pos(), e->globalPos(),
(e->button()&m_realizeButtons)?Qt::LeftButton : Qt::NoButton, e->state());
Q3Button::mouseReleaseEvent(&me);
QAbstractButton::mouseReleaseEvent(&me);
}

4
lib/kcommondecoration.h
View file

@ -25,7 +25,7 @@
#ifndef KCOMMONDECORATION_H
#define KCOMMONDECORATION_H
#include <Q3Button>
#include <QAbstractButton>
#include "kdecoration.h"
class KDecorationBridge;
@ -285,7 +285,7 @@ class KWIN_EXPORT KCommonDecoration : public KDecoration
/**
* Title bar buttons of KCommonDecoration need to inherit this class.
*/
class KWIN_EXPORT KCommonDecorationButton : public Q3Button
class KWIN_EXPORT KCommonDecorationButton : public QAbstractButton
{
friend class KCommonDecoration;