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

Reverting the no-flicker when moving titlebar patch. It doesn't repaint

Browse source 
properly, the whole thing needs an overhaul (I never anticipated the thing
being movable) and I want to use it now ;-)

svn path=/trunk/kdebase/kwin/; revision=47542
This commit is contained in:
Daniel M. Duley 2000-04-25 22:44:25 +00:00
parent d70c3af41e
commit 3922d1994a
2 changed files with 11 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

27
clients/b2/b2client.cpp
View file

@ -282,15 +282,11 @@ B2Client::B2Client( Workspace *ws, WId w, QWidget *parent,
else else
button[BtnMax]->setPixmaps(iMaxPix, iMaxPixDown); button[BtnMax]->setPixmaps(iMaxPix, iMaxPixDown);
} }
// QColor c = options->colorGroup(Options::TitleBar, isActive()). QColor c = options->colorGroup(Options::TitleBar, isActive()).
// color(QColorGroup::Button);
QColor c = options->colorGroup(Options::TitleBar, true).
color(QColorGroup::Button); color(QColorGroup::Button);
for(i=0; i < 6; ++i) for(i=0; i < 6; ++i)
button[i]->setBg(c); button[i]->setBg(c);
setBackgroundColor(c);
positionButtons(); positionButtons();
connect(button[BtnMenu], SIGNAL(clicked()), this, SLOT(menuButtonPressed())); connect(button[BtnMenu], SIGNAL(clicked()), this, SLOT(menuButtonPressed()));
connect(button[BtnSticky], SIGNAL(clicked()), this, SLOT(toggleSticky())); connect(button[BtnSticky], SIGNAL(clicked()), this, SLOT(toggleSticky()));
@ -323,14 +319,13 @@ void B2Client::captionChange( const QString &)
{ {
positionButtons(); positionButtons();
doShape(); doShape();
repaint(false); repaint();
} }
void B2Client::paintEvent( QPaintEvent* ) void B2Client::paintEvent( QPaintEvent* )
{ {
QPixmap pm(size());
QPainter p; QPainter p( this );
p.begin( &pm, this );
QRect t = g->cellGeometry(0, 1); QRect t = g->cellGeometry(0, 1);
t.setRight(button[BtnClose]->x()+17); t.setRight(button[BtnClose]->x()+17);
@ -387,8 +382,6 @@ void B2Client::paintEvent( QPaintEvent* )
button[BtnSticky]->x()+17); button[BtnSticky]->x()+17);
t.setRight(button[BtnIconify]->x()-1); t.setRight(button[BtnIconify]->x()-1);
p.drawText(t, AlignLeft | AlignVCenter, caption()); p.drawText(t, AlignLeft | AlignVCenter, caption());
p.end();
bitBlt(this, 0, 0, &pm);
} }
#define QCOORDARRLEN(x) sizeof(x)/(sizeof(QCOORD)*2) #define QCOORDARRLEN(x) sizeof(x)/(sizeof(QCOORD)*2)
@ -421,7 +414,7 @@ void B2Client::showEvent(QShowEvent *ev)
{ {
Client::showEvent(ev); Client::showEvent(ev);
doShape(); doShape();
repaint(false); repaint();
} }
void B2Client::windowWrapperShowEvent( QShowEvent* ) void B2Client::windowWrapperShowEvent( QShowEvent* )
@ -511,7 +504,7 @@ void B2Client::mouseMoveEvent( QMouseEvent * e)
if (bar_x_ofs != old_ofs) { if (bar_x_ofs != old_ofs) {
positionButtons(); positionButtons();
doShape(); doShape();
repaint( 0, 0, width(), t.height(), false ); repaint( 0, 0, width(), t.height(), true );
} }
} }
} else } else
@ -537,7 +530,7 @@ void B2Client::maximizeChange(bool m)
else else
button[BtnMax]->setPixmaps(iMaxPix, iMaxPixDown); button[BtnMax]->setPixmaps(iMaxPix, iMaxPixDown);
} }
button[BtnMax]->repaint(false); button[BtnMax]->repaint();
} }
@ -570,7 +563,7 @@ void B2Client::activeChange(bool on)
color(QColorGroup::Button); color(QColorGroup::Button);
for(i=0; i < 6; ++i){ for(i=0; i < 6; ++i){
button[i]->setBg(c); button[i]->setBg(c);
button[i]->repaint(false); button[i]->repaint();
} }
Client::activeChange(on); Client::activeChange(on);
} }
@ -597,7 +590,7 @@ void B2Client::slotReset()
button[i]->setBg(c); button[i]->setBg(c);
button[i]->repaint(false); button[i]->repaint(false);
} }
repaint(false); repaint();
} }
static void redraw_pixmaps() static void redraw_pixmaps()

2
clients/b2/b2client.h
View file

@ -16,7 +16,7 @@ public:
B2Button(QWidget *parent=0, const char *name=0) B2Button(QWidget *parent=0, const char *name=0)
: QButton(parent, name){useMiniIcon = false;} : QButton(parent, name){useMiniIcon = false;}
B2Button(KPixmap *pix, KPixmap *pixDown, QWidget *parent=0, const char *name=0); B2Button(KPixmap *pix, KPixmap *pixDown, QWidget *parent=0, const char *name=0);
void setBg(const QColor &c){bg = c; setBackgroundColor(c);} void setBg(const QColor &c){bg = c;}
void setPixmaps(KPixmap *pix, KPixmap *pixDown); void setPixmaps(KPixmap *pix, KPixmap *pixDown);
void setToggle(){setToggleType(Toggle);} void setToggle(){setToggleType(Toggle);}
void setActive(bool on){setOn(on);} void setActive(bool on){setOn(on);}