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

Thinking about what Cristian said and how it's going to be difficult to

Browse source 
satisfy both laptop users who want large buttons and those who have low
resolution and want small bars. So I made it configurable :)

You can now set the titlebar height anywhere from 14 to 32 pixels, which also
changes the button size:

You currently need to edit ~/.kde/share/config/kwinrc and set:

[Laptop]
TitleHeight=Some number between 14-32.

Then restart KWin (it's not in the options class yet). The default is still
a small titlebar.

Here's the shot I put up before with the default small titlebar:
http://www.mosfet.org/kwinlaptop.gif

Here's one with a larger titlebar (21 pixels):
http://www.mosfet.org/laptop-bigtitlebar.gif

svn path=/trunk/kdebase/kwin/; revision=44755
This commit is contained in:
Daniel M. Duley 2000-03-26 13:42:16 +00:00
parent 954f25c36e
commit 1079007ceb
1 changed files with 38 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

55
clients/laptop/laptopclient.cpp
View file

@ -1,3 +1,4 @@
#include <kconfig.h> // up here to avoid X11 header conflict :P
#include "laptopclient.h" #include "laptopclient.h"
#include <qapplication.h> #include <qapplication.h>
#include <qcursor.h> #include <qcursor.h>
@ -8,6 +9,7 @@
#include <qdrawutil.h> #include <qdrawutil.h>
#include <kpixmapeffect.h> #include <kpixmapeffect.h>
#include <kdrawutil.h> #include <kdrawutil.h>
#include <kglobal.h>
#include <kapp.h> #include <kapp.h>
#include <qbitmap.h> #include <qbitmap.h>
#include "../../workspace.h" #include "../../workspace.h"
@ -48,6 +50,8 @@ static KPixmap *aUpperGradient=0;
static KPixmap *iUpperGradient=0; static KPixmap *iUpperGradient=0;
static bool pixmaps_created = false; static bool pixmaps_created = false;
static int titleHeight = -1;
static void create_pixmaps() static void create_pixmaps()
{ {
if(pixmaps_created) if(pixmaps_created)
@ -81,9 +85,9 @@ static void create_pixmaps()
if(QPixmap::defaultDepth() > 8){ if(QPixmap::defaultDepth() > 8){
aUpperGradient = new KPixmap; aUpperGradient = new KPixmap;
aUpperGradient->resize(32, 16); aUpperGradient->resize(32, titleHeight+2);
iUpperGradient = new KPixmap; iUpperGradient = new KPixmap;
iUpperGradient->resize(32, 16); iUpperGradient->resize(32, titleHeight+2);
//QColor bgColor = kapp->palette().normal().background(); //QColor bgColor = kapp->palette().normal().background();
QColor bgColor = options->color(Options::TitleBar, true); QColor bgColor = options->color(Options::TitleBar, true);
KPixmapEffect::gradient(*aUpperGradient, KPixmapEffect::gradient(*aUpperGradient,
@ -196,10 +200,21 @@ LaptopClient::LaptopClient( Workspace *ws, WId w, QWidget *parent,
const char *name ) const char *name )
: Client( ws, w, parent, name, WResizeNoErase ) : Client( ws, w, parent, name, WResizeNoErase )
{ {
if(titleHeight == -1){
KConfig *config = KGlobal::config();
config->setGroup("Laptop");
titleHeight = config->readNumEntry("TitleHeight", 14);
if(titleHeight < 14)
titleHeight = 14;
if(titleHeight > 32)
titleHeight = 32;
}
create_pixmaps(); create_pixmaps();
connect(options, SIGNAL(resetClients()), this, SLOT(slotReset())); connect(options, SIGNAL(resetClients()), this, SLOT(slotReset()));
bool help = providesContextHelp(); bool help = providesContextHelp();
QGridLayout* g = new QGridLayout(this, 0, 0, 0); QGridLayout* g = new QGridLayout(this, 0, 0, 0);
g->addRowSpacing(0, 3); g->addRowSpacing(0, 3);
g->addRowSpacing(2, 1); g->addRowSpacing(2, 1);
@ -210,16 +225,19 @@ LaptopClient::LaptopClient( Workspace *ws, WId w, QWidget *parent,
g->addColSpacing(2, 4); g->addColSpacing(2, 4);
g->addColSpacing(2, 12); g->addColSpacing(2, 12);
button[0] = new SystemButton(28, 12, this, "close", close_bits); button[0] = new SystemButton(28, titleHeight-2, this, "close", close_bits);
button[1] = new SystemButton(18, 12, this, "sticky"); button[1] = new SystemButton(18, titleHeight-2, this, "sticky");
if(isSticky()) if(isSticky())
button[1]->setBitmap(unsticky_bits); button[1]->setBitmap(unsticky_bits);
else else
button[1]->setBitmap(sticky_bits); button[1]->setBitmap(sticky_bits);
button[2] = new SystemButton(28, 12, this, "iconify", iconify_bits); button[2] = new SystemButton(28, titleHeight-2, this, "iconify",
button[3] = new SystemButton(28, 12, this, "maximize", maximize_bits); iconify_bits);
button[3] = new SystemButton(28, titleHeight-2, this, "maximize",
maximize_bits);
if(help){ if(help){
button[4] = new SystemButton(18, 12, this, "help", question_bits); button[4] = new SystemButton(18, titleHeight-2, this, "help",
question_bits);
connect( button[4], SIGNAL( clicked() ), this, ( SLOT( contextHelp() ) ) ); connect( button[4], SIGNAL( clicked() ), this, ( SLOT( contextHelp() ) ) );
} }
else else
@ -235,7 +253,7 @@ LaptopClient::LaptopClient( Workspace *ws, WId w, QWidget *parent,
g->addLayout( hb, 1, 1 ); g->addLayout( hb, 1, 1 );
hb->addWidget( button[0]); hb->addWidget( button[0]);
hb->addSpacing(3); hb->addSpacing(3);
titlebar = new QSpacerItem(10, 14, QSizePolicy::Expanding, titlebar = new QSpacerItem(10, titleHeight, QSizePolicy::Expanding,
QSizePolicy::Minimum); QSizePolicy::Minimum);
hb->addItem(titlebar); hb->addItem(titlebar);
hb->addSpacing(3); hb->addSpacing(3);
@ -297,8 +315,10 @@ void LaptopClient::paintEvent( QPaintEvent* )
p.drawRect(r); p.drawRect(r);
qDrawShadeRect(&p, r.x()+1, r.y()+1, r.width()-2, r.height()-2, g, false, qDrawShadeRect(&p, r.x()+1, r.y()+1, r.width()-2, r.height()-2, g, false,
1, 0, &g.brush(QColorGroup::Background)); 1, 0, &g.brush(QColorGroup::Background));
qDrawShadePanel(&p, r.x()+3, r.y()+17, r.width()-6, r.height()-20, g, //qDrawShadePanel(&p, r.x()+3, r.y()+17, r.width()-6, r.height()-20, g,
true, 1); // true, 1);
qDrawShadePanel(&p, r.x()+3, r.y()+titleHeight+3, r.width()-6,
r.height()-titleHeight-6, g, true, 1);
r = titlebar->geometry(); r = titlebar->geometry();
KPixmap *grPix = isActive() ? aUpperGradient : iUpperGradient; KPixmap *grPix = isActive() ? aUpperGradient : iUpperGradient;
@ -311,7 +331,7 @@ void LaptopClient::paintEvent( QPaintEvent* )
options->color(Options::TitleBar, isActive())); options->color(Options::TitleBar, isActive()));
if(titlePix && isActive()) if(titlePix && isActive())
p.drawTiledPixmap(r, *titlePix); p.drawTiledPixmap(r.x(), r.y(), r.width(), r.height()-1, *titlePix);
if(grPix){ // needs to happen after the above if(grPix){ // needs to happen after the above
p.setPen(options->color(Options::TitleBar, isActive())); p.setPen(options->color(Options::TitleBar, isActive()));
@ -321,22 +341,23 @@ void LaptopClient::paintEvent( QPaintEvent* )
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();
int h = titleHeight-2;
g = options->colorGroup(Options::Frame, isActive()); g = options->colorGroup(Options::Frame, isActive());
p.setPen(g.dark()); p.setPen(g.dark());
p.drawLine(rBtn->x()-1, rBtn->y()-1, x2, rBtn->y()-1); p.drawLine(rBtn->x()-1, rBtn->y()-1, x2, rBtn->y()-1);
p.drawLine(rBtn->x()-1, rBtn->y()-1, rBtn->x()-1, rBtn->y()+12); p.drawLine(rBtn->x()-1, rBtn->y()-1, rBtn->x()-1, rBtn->y()+h);
p.setPen(g.midlight()); p.setPen(g.midlight());
p.drawLine(x2, rBtn->y()-1, x2, rBtn->y()+12); p.drawLine(x2, rBtn->y()-1, x2, rBtn->y()+h);
p.drawLine(rBtn->x()-1, rBtn->y()+12, x2, rBtn->y()+12); p.drawLine(rBtn->x()-1, rBtn->y()+h, x2, rBtn->y()+h);
rBtn = button[0]; rBtn = button[0];
x2 = button[0]->x()+28; x2 = button[0]->x()+28;
p.setPen(g.dark()); p.setPen(g.dark());
p.drawLine(rBtn->x()-1, rBtn->y()-1, x2, rBtn->y()-1); p.drawLine(rBtn->x()-1, rBtn->y()-1, x2, rBtn->y()-1);
p.drawLine(rBtn->x()-1, rBtn->y()-1, rBtn->x()-1, rBtn->y()+12); p.drawLine(rBtn->x()-1, rBtn->y()-1, rBtn->x()-1, rBtn->y()+h);
p.setPen(g.midlight()); p.setPen(g.midlight());
p.drawLine(x2, rBtn->y()-1, x2, rBtn->y()+12); p.drawLine(x2, rBtn->y()-1, x2, rBtn->y()+h);
p.drawLine(rBtn->x()-1, rBtn->y()+12, x2, rBtn->y()+12); p.drawLine(rBtn->x()-1, rBtn->y()+h, x2, rBtn->y()+h);
p.setPen(options->color(Options::Font, isActive())); p.setPen(options->color(Options::Font, isActive()));
p.setFont(options->font(isActive())); p.setFont(options->font(isActive()));