Frame for the titlebar. I originally left this out to leave more room for
the text when using tiny titlebars but it looks like crap without it ;-) BTW, is this style working well for laptop people? svn path=/trunk/kdebase/kwin/; revision=44853
This commit is contained in:
parent
1079007ceb
commit
9e709f2784
1 changed files with 16 additions and 9 deletions
|
@ -204,8 +204,8 @@ LaptopClient::LaptopClient( Workspace *ws, WId w, QWidget *parent,
|
||||||
KConfig *config = KGlobal::config();
|
KConfig *config = KGlobal::config();
|
||||||
config->setGroup("Laptop");
|
config->setGroup("Laptop");
|
||||||
titleHeight = config->readNumEntry("TitleHeight", 14);
|
titleHeight = config->readNumEntry("TitleHeight", 14);
|
||||||
if(titleHeight < 14)
|
if(titleHeight < 15)
|
||||||
titleHeight = 14;
|
titleHeight = 15;
|
||||||
if(titleHeight > 32)
|
if(titleHeight > 32)
|
||||||
titleHeight = 32;
|
titleHeight = 32;
|
||||||
}
|
}
|
||||||
|
@ -333,11 +333,7 @@ void LaptopClient::paintEvent( QPaintEvent* )
|
||||||
if(titlePix && isActive())
|
if(titlePix && isActive())
|
||||||
p.drawTiledPixmap(r.x(), r.y(), r.width(), r.height()-1, *titlePix);
|
p.drawTiledPixmap(r.x(), r.y(), r.width(), r.height()-1, *titlePix);
|
||||||
|
|
||||||
if(grPix){ // needs to happen after the above
|
|
||||||
p.setPen(options->color(Options::TitleBar, isActive()));
|
|
||||||
p.drawRect(r.x(), r.y(), r.width(), r.height()-1);
|
|
||||||
}
|
|
||||||
|
|
||||||
QButton *rBtn = providesContextHelp() ? button[4] : button[1];
|
QButton *rBtn = providesContextHelp() ? button[4] : button[1];
|
||||||
int x2 = button[3]->x()+button[3]->width();
|
int x2 = button[3]->x()+button[3]->width();
|
||||||
|
|
||||||
|
@ -359,7 +355,6 @@ void LaptopClient::paintEvent( QPaintEvent* )
|
||||||
p.drawLine(x2, rBtn->y()-1, x2, rBtn->y()+h);
|
p.drawLine(x2, rBtn->y()-1, x2, rBtn->y()+h);
|
||||||
p.drawLine(rBtn->x()-1, rBtn->y()+h, x2, rBtn->y()+h);
|
p.drawLine(rBtn->x()-1, rBtn->y()+h, x2, rBtn->y()+h);
|
||||||
|
|
||||||
p.setPen(options->color(Options::Font, isActive()));
|
|
||||||
p.setFont(options->font(isActive()));
|
p.setFont(options->font(isActive()));
|
||||||
QFontMetrics fm(options->font(true));
|
QFontMetrics fm(options->font(true));
|
||||||
g = options->colorGroup(Options::TitleBar, isActive());
|
g = options->colorGroup(Options::TitleBar, isActive());
|
||||||
|
@ -370,9 +365,21 @@ void LaptopClient::paintEvent( QPaintEvent* )
|
||||||
*grPix);
|
*grPix);
|
||||||
else
|
else
|
||||||
p.fillRect(r.x()+((r.width()-fm.width(caption()))/2)-4, r.y(),
|
p.fillRect(r.x()+((r.width()-fm.width(caption()))/2)-4, r.y(),
|
||||||
fm.width(caption())+8, r.height(),
|
fm.width(caption())+8, r.height()-1,
|
||||||
g.brush(QColorGroup::Background));
|
g.brush(QColorGroup::Background));
|
||||||
}
|
}
|
||||||
|
/*
|
||||||
|
qDrawShadePanel(&p, r.x(), r.y(), r.width(), r.height()-1,
|
||||||
|
options->colorGroup(Options::TitleBar, isActive()),
|
||||||
|
true, 1);
|
||||||
|
*/
|
||||||
|
p.setPen(g.mid());
|
||||||
|
p.drawLine(r.x(), r.y(), r.right(), r.y());
|
||||||
|
p.drawLine(r.x(), r.y(), r.x(), r.bottom()-1);
|
||||||
|
p.setPen(g.button());
|
||||||
|
p.drawLine(r.right(), r.y(), r.right(), r.bottom()-1);
|
||||||
|
p.drawLine(r.x(), r.bottom()-1, r.right(), r.bottom()-1);
|
||||||
|
p.setPen(options->color(Options::Font, isActive()));
|
||||||
p.drawText(r.x(), r.y(), r.width(), r.height()-1,
|
p.drawText(r.x(), r.y(), r.width(), r.height()-1,
|
||||||
AlignCenter, caption() );
|
AlignCenter, caption() );
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in a new issue