Cool new Kwin C++ style engine - Modern system :) This uses buttons orignally
from the KStyle aqua theme - color reduced, converted to bitmaps, and drawn using the color scheme. The buttons in different color schemes shows why it's really cool to support dynamic C++ engines as well as pixmap themes ;-) Also uses a small frame with a resize handle and mac-like (hehe - of course ;-) drawing for everything else. Preliminary screenshots with different color schemes are at: http://www.mosfet.org/modern-0428.html svn path=/trunk/kdebase/kwin/; revision=47624
This commit is contained in:
Daniel M. Duley
parent
f65ca70e0b
commit
0ae123ceef
8 changed files with 611 additions and 5 deletions
|
|
@ -1 +1 @@
|
||||||
SUBDIRS=kstep system b2 laptop riscos mwm
|
SUBDIRS=kstep system b2 laptop riscos mwm modernsystem
|
||||||
|
|
|
||||||
|
|
@ -1,3 +1,4 @@
|
||||||
|
SUBDIRS=applytheme defaultpics
|
||||||
|
|
||||||
INCLUDES = $(all_includes)
|
INCLUDES = $(all_includes)
|
||||||
|
|
||||||
|
|
@ -9,7 +10,7 @@ METASOURCES = AUTO
|
||||||
noinst_HEADERS = kwmthemeclient.h
|
noinst_HEADERS = kwmthemeclient.h
|
||||||
|
|
||||||
lnkdir = $(kde_datadir)/kwin/
|
lnkdir = $(kde_datadir)/kwin/
|
||||||
lnk_DATA = #kwmtheme.desktop
|
lnk_DATA = kwmtheme.desktop
|
||||||
|
|
||||||
EXTRA_DIST = $(lnk_DATA)
|
EXTRA_DIST = $(lnk_DATA)
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -116,7 +116,8 @@ static void init_theme()
|
||||||
titleAlign = Qt::AlignCenter;
|
titleAlign = Qt::AlignCenter;
|
||||||
else
|
else
|
||||||
titleAlign = Qt::AlignLeft | Qt::AlignVCenter;
|
titleAlign = Qt::AlignLeft | Qt::AlignVCenter;
|
||||||
titleSunken = config->readBoolEntry("TitleFrameShaded", false);
|
titleSunken = config->readBoolEntry("TitleFrameShaded", true);
|
||||||
|
titleSunken = true; // FIXME
|
||||||
titleTransparent = config->readBoolEntry("PixmapUnderTitleText", true);
|
titleTransparent = config->readBoolEntry("PixmapUnderTitleText", true);
|
||||||
|
|
||||||
tmpStr = config->readEntry("TitlebarLook");
|
tmpStr = config->readEntry("TitlebarLook");
|
||||||
|
|
@ -150,8 +151,23 @@ static void init_theme()
|
||||||
grType = KPixmapEffect::PipeCrossGradient;
|
grType = KPixmapEffect::PipeCrossGradient;
|
||||||
else if(tmpStr == "shadedElliptic")
|
else if(tmpStr == "shadedElliptic")
|
||||||
grType = KPixmapEffect::EllipticGradient;
|
grType = KPixmapEffect::EllipticGradient;
|
||||||
else
|
else{
|
||||||
titleGradient = false;
|
titleGradient = false;
|
||||||
|
tmpStr = config->readEntry("TitlebarPixmapActive", "");
|
||||||
|
if(!tmpStr.isEmpty()){
|
||||||
|
aTitlePix = new KPixmap;
|
||||||
|
aTitlePix->load(localBaseDir + "/kwmtheme/themepics/" + tmpStr);
|
||||||
|
}
|
||||||
|
else
|
||||||
|
aTitlePix = NULL;
|
||||||
|
tmpStr = config->readEntry("TitlebarPixmapInactive", "");
|
||||||
|
if(!tmpStr.isEmpty()){
|
||||||
|
iTitlePix = new KPixmap;
|
||||||
|
iTitlePix->load(localBaseDir + "/kwmtheme/themepics/" + tmpStr);
|
||||||
|
}
|
||||||
|
else
|
||||||
|
iTitlePix = NULL;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
void MyButton::drawButtonLabel(QPainter *p)
|
void MyButton::drawButtonLabel(QPainter *p)
|
||||||
|
|
@ -250,6 +266,7 @@ KWMThemeClient::KWMThemeClient( Workspace *ws, WId w, QWidget *parent,
|
||||||
iGradient = NULL;
|
iGradient = NULL;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
setBackgroundMode(NoBackground);
|
||||||
}
|
}
|
||||||
|
|
||||||
void KWMThemeClient::drawTitle(QPainter &p)
|
void KWMThemeClient::drawTitle(QPainter &p)
|
||||||
|
|
@ -257,10 +274,13 @@ void KWMThemeClient::drawTitle(QPainter &p)
|
||||||
QRect r = titlebar->geometry();
|
QRect r = titlebar->geometry();
|
||||||
|
|
||||||
if(titleSunken){
|
if(titleSunken){
|
||||||
|
warning("Title is sunken");
|
||||||
qDrawShadeRect(&p, r, options->colorGroup(Options::Frame, isActive()),
|
qDrawShadeRect(&p, r, options->colorGroup(Options::Frame, isActive()),
|
||||||
true, 1, 0);
|
true, 1, 0);
|
||||||
r.setRect(r.x()+1, r.y()+1, r.width()-2, r.height()-2);
|
r.setRect(r.x()+1, r.y()+1, r.width()-2, r.height()-2);
|
||||||
}
|
}
|
||||||
|
else
|
||||||
|
warning("Title is not sunken");
|
||||||
|
|
||||||
KPixmap *fill = isActive() ? aTitlePix : iTitlePix;
|
KPixmap *fill = isActive() ? aTitlePix : iTitlePix;
|
||||||
if(fill)
|
if(fill)
|
||||||
|
|
@ -308,6 +328,10 @@ void KWMThemeClient::captionChange( const QString& )
|
||||||
void KWMThemeClient::paintEvent( QPaintEvent* )
|
void KWMThemeClient::paintEvent( QPaintEvent* )
|
||||||
{
|
{
|
||||||
QPainter p;
|
QPainter p;
|
||||||
|
p.begin(this);
|
||||||
|
p.fillRect(rect(), options->colorGroup(Options::Frame, isActive()).
|
||||||
|
brush(QColorGroup::Background));
|
||||||
|
|
||||||
// first the corners
|
// first the corners
|
||||||
int w1 = framePixmaps[FrameTopLeft]->width();
|
int w1 = framePixmaps[FrameTopLeft]->width();
|
||||||
int h1 = framePixmaps[FrameTopLeft]->height();
|
int h1 = framePixmaps[FrameTopLeft]->height();
|
||||||
|
|
@ -352,7 +376,6 @@ void KWMThemeClient::paintEvent( QPaintEvent* )
|
||||||
curPix = framePixmaps[FrameRight];
|
curPix = framePixmaps[FrameRight];
|
||||||
tileVert(this, curPix, width()-maxExtent+1, h2, height()-h2-h4);
|
tileVert(this, curPix, width()-maxExtent+1, h2, height()-h2-h4);
|
||||||
|
|
||||||
p.begin(this);
|
|
||||||
drawTitle(p);
|
drawTitle(p);
|
||||||
p.end();
|
p.end();
|
||||||
}
|
}
|
||||||
|
|
|
||||||
21
clients/modernsystem/Makefile.am
Normal file
21
clients/modernsystem/Makefile.am
Normal file
|
|
@ -0,0 +1,21 @@
|
||||||
|
|
||||||
|
INCLUDES = $(all_includes)
|
||||||
|
|
||||||
|
lib_LTLIBRARIES = libkwinmodernsys.la
|
||||||
|
|
||||||
|
libkwinmodernsys_la_SOURCES = modernsys.cpp
|
||||||
|
|
||||||
|
METASOURCES = AUTO
|
||||||
|
noinst_HEADERS = modernsys.h
|
||||||
|
|
||||||
|
lnkdir = $(kde_datadir)/kwin/
|
||||||
|
lnk_DATA = modernsystem.desktop
|
||||||
|
|
||||||
|
EXTRA_DIST = $(lnk_DATA)
|
||||||
|
|
||||||
|
libkwinmodernsys_la_LDFLAGS = $(all_libraries) -version-info 1:0:0 -module
|
||||||
|
libkwinmodernsys_la_LIBADD = $(LIB_KDEUI)
|
||||||
|
|
||||||
|
###KMAKE-start (don't edit or delete this block)
|
||||||
|
|
||||||
|
###KMAKE-end
|
||||||
42
clients/modernsystem/buttondata.h
Normal file
42
clients/modernsystem/buttondata.h
Normal file
|
|
@ -0,0 +1,42 @@
|
||||||
|
/* Image bits processed by KPixmap2Bitmaps */
|
||||||
|
|
||||||
|
#define bmap_mask_width 14
|
||||||
|
#define bmap_mask_height 15
|
||||||
|
static unsigned char bmap_mask_bits[] = {
|
||||||
|
0xf0,0x03,0xf8,0x07,0xfc,0xcf,0xfe,0x1f,0xfe,0x1f,0xff,0xff,0xff,0xff,0xff,
|
||||||
|
0x3f,0xff,0x3f,0xff,0xbf,0xfe,0xdf,0xfe,0x9f,0xfc,0x0f,0xf8,0x07,0xf0,0x03,
|
||||||
|
0x00,0x40,0x80,0x00,0x00,0x00,0x29,0x00,0x00,0x00,0x7c,0xfe,0x87,0x40,0x00,
|
||||||
|
0x00,0x64,0x00,0x20,0x00,0x64,0x00,0x86,0xfe,0x87,0x40,0x00,0x00,0x65,0x00 };
|
||||||
|
|
||||||
|
#define bmap_6a696a_width 14
|
||||||
|
#define bmap_6a696a_height 15
|
||||||
|
static unsigned char bmap_6a696a_bits[] = {
|
||||||
|
0xf0,0x03,0x18,0x06,0x04,0xcc,0x06,0x18,0x02,0x10,0x00,0xc0,0x00,0xc0,0x00,
|
||||||
|
0x00,0x00,0x00,0x00,0xc0,0x00,0xc0,0x00,0x80,0x00,0x00,0x00,0x00,0x00,0x00,
|
||||||
|
0x00,0x40,0x80,0x00,0x00,0x00,0x11,0x00,0x00,0x00,0x01,0x00,0x00,0x00,0x03,
|
||||||
|
0x00,0x00,0x00,0x80,0x24,0x0e,0x08,0x61,0x00,0x00,0x00,0xf0,0xd9,0x0c,0x08 };
|
||||||
|
|
||||||
|
#define bmap_949194_width 14
|
||||||
|
#define bmap_949194_height 15
|
||||||
|
static unsigned char bmap_949194_bits[] = {
|
||||||
|
0x00,0x40,0xe0,0x01,0x08,0x02,0x00,0x04,0x04,0x08,0x07,0x78,0x03,0xf0,0x01,
|
||||||
|
0xe0,0x01,0x60,0x01,0x20,0x00,0xc0,0x02,0x90,0x04,0x08,0x08,0x04,0xf0,0x03,
|
||||||
|
0x00,0x40,0x80,0x00,0x00,0x00,0x21,0x00,0x00,0x00,0xc8,0x51,0x0c,0x08,0x0e,
|
||||||
|
0x01,0x00,0x00,0x37,0x00,0x00,0x00,0x58,0x5f,0x49,0x6d,0x61,0x67,0x65,0x54 };
|
||||||
|
|
||||||
|
#define bmap_b4b6b4_width 14
|
||||||
|
#define bmap_b4b6b4_height 15
|
||||||
|
static unsigned char bmap_b4b6b4_bits[] = {
|
||||||
|
0x00,0x40,0x00,0x00,0x10,0x00,0x08,0x02,0x18,0x06,0xb8,0x47,0x0c,0xce,0x0e,
|
||||||
|
0xd8,0x06,0x58,0x02,0x10,0x02,0xd0,0x00,0x80,0x00,0x00,0x10,0x02,0x00,0x00,
|
||||||
|
0x00,0x40,0x80,0x00,0x00,0x00,0x11,0x00,0x00,0x00,0x01,0x00,0x00,0x00,0x01,
|
||||||
|
0x00,0x08,0x00,0x02,0x00,0x00,0x00,0x61,0x00,0x00,0x00,0x38,0x5b,0x0c,0x08 };
|
||||||
|
|
||||||
|
#define bmap_e6e6e6_width 14
|
||||||
|
#define bmap_e6e6e6_height 15
|
||||||
|
static unsigned char bmap_e6e6e6_bits[] = {
|
||||||
|
0x00,0x40,0x00,0x00,0x00,0x00,0xe0,0x01,0x00,0x00,0x00,0x40,0x00,0xc0,0x00,
|
||||||
|
0xc0,0x00,0x40,0xe0,0xc0,0xe0,0xc1,0xe0,0x81,0xf0,0x03,0xc0,0x00,0x00,0x00,
|
||||||
|
0x00,0x40,0x80,0x00,0x00,0x00,0x39,0x00,0x00,0x00,0x08,0x19,0x0d,0x08,0x00,
|
||||||
|
0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x01,0x00,0x00,0x00,0x01,0x00,0x00,0x00 };
|
||||||
|
|
||||||
456
clients/modernsystem/modernsys.cpp
Normal file
456
clients/modernsystem/modernsys.cpp
Normal file
|
|
@ -0,0 +1,456 @@
|
||||||
|
#include "modernsys.h"
|
||||||
|
#include <qapplication.h>
|
||||||
|
#include <qcursor.h>
|
||||||
|
#include <qabstractlayout.h>
|
||||||
|
#include <qlayout.h>
|
||||||
|
#include <qtoolbutton.h>
|
||||||
|
#include <qlabel.h>
|
||||||
|
#include <qdrawutil.h>
|
||||||
|
#include <kpixmapeffect.h>
|
||||||
|
#include <kdrawutil.h>
|
||||||
|
#include <kapp.h>
|
||||||
|
#include <qbitmap.h>
|
||||||
|
#include "../../workspace.h"
|
||||||
|
#include "../../options.h"
|
||||||
|
|
||||||
|
#include "buttondata.h"
|
||||||
|
|
||||||
|
extern "C"
|
||||||
|
{
|
||||||
|
Client *allocate(Workspace *ws, WId w)
|
||||||
|
{
|
||||||
|
return(new ModernSys(ws, w));
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
static unsigned char iconify_bits[] = {
|
||||||
|
0x00, 0x00, 0xff, 0xff, 0x7e, 0x3c, 0x18, 0x00};
|
||||||
|
|
||||||
|
/* not used currently
|
||||||
|
static unsigned char close_bits[] = {
|
||||||
|
0xc3, 0x66, 0x3c, 0x18, 0x3c, 0x66, 0xc3, 0x00};
|
||||||
|
*/
|
||||||
|
static unsigned char maximize_bits[] = {
|
||||||
|
0x00, 0x18, 0x3c, 0x7e, 0xff, 0xff, 0x00, 0x00};
|
||||||
|
|
||||||
|
static unsigned char minmax_bits[] = {
|
||||||
|
0x0c, 0x18, 0x33, 0x67, 0xcf, 0x9f, 0x3f, 0x3f};
|
||||||
|
|
||||||
|
static unsigned char unsticky_bits[] = {
|
||||||
|
0x00, 0x18, 0x18, 0x7e, 0x7e, 0x18, 0x18, 0x00};
|
||||||
|
|
||||||
|
static unsigned char sticky_bits[] = {
|
||||||
|
0x00, 0x00, 0x00, 0x7e, 0x7e, 0x00, 0x00, 0x00};
|
||||||
|
|
||||||
|
static unsigned char question_bits[] = {
|
||||||
|
0x3c, 0x66, 0x60, 0x30, 0x18, 0x00, 0x18, 0x18};
|
||||||
|
|
||||||
|
static KPixmap *aUpperGradient=0;
|
||||||
|
static KPixmap *iUpperGradient=0;
|
||||||
|
static QPixmap *buttonPix=0;
|
||||||
|
static QPixmap *buttonPixDown=0;
|
||||||
|
static QPixmap *iButtonPix=0;
|
||||||
|
static QPixmap *iButtonPixDown=0;
|
||||||
|
|
||||||
|
static QColor buttonFg;
|
||||||
|
static bool pixmaps_created = false;
|
||||||
|
|
||||||
|
static void make_button_fx(const QColor &btnColor, QPixmap *pix)
|
||||||
|
{
|
||||||
|
static QBitmap bDark1(14, 15, bmap_6a696a_bits, true);
|
||||||
|
static QBitmap bDark2(14, 15, bmap_949194_bits, true);
|
||||||
|
static QBitmap bDark3(14, 15, bmap_b4b6b4_bits, true);
|
||||||
|
static QBitmap bLight1(14, 15, bmap_e6e6e6_bits, true);
|
||||||
|
|
||||||
|
if(!bDark1.mask()){
|
||||||
|
bDark1.setMask(bDark1);
|
||||||
|
bDark2.setMask(bDark2);
|
||||||
|
bDark3.setMask(bDark3);
|
||||||
|
bLight1.setMask(bLight1);
|
||||||
|
}
|
||||||
|
pix->fill(btnColor);
|
||||||
|
QPainter p(pix);
|
||||||
|
p.setPen(btnColor.dark(120));
|
||||||
|
p.drawPixmap(0, 0, bDark3);
|
||||||
|
p.setPen(btnColor.dark(140));
|
||||||
|
p.drawPixmap(0, 0, bDark2);
|
||||||
|
p.setPen(btnColor.dark(150));
|
||||||
|
p.drawPixmap(0, 0, bDark1);
|
||||||
|
p.setPen(btnColor.light(130));
|
||||||
|
p.drawPixmap(0, 0, bLight1);
|
||||||
|
p.end();
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
static void create_pixmaps()
|
||||||
|
{
|
||||||
|
if(pixmaps_created)
|
||||||
|
return;
|
||||||
|
pixmaps_created = true;
|
||||||
|
|
||||||
|
aUpperGradient = new KPixmap;
|
||||||
|
aUpperGradient->resize(32, 18);
|
||||||
|
iUpperGradient = new KPixmap;
|
||||||
|
iUpperGradient->resize(32, 18);
|
||||||
|
KPixmapEffect::gradient(*aUpperGradient,
|
||||||
|
options->color(Options::TitleBar, true).light(130),
|
||||||
|
options->color(Options::TitleBlend, true),
|
||||||
|
KPixmapEffect::VerticalGradient);
|
||||||
|
KPixmapEffect::gradient(*iUpperGradient,
|
||||||
|
options->color(Options::TitleBar, false).light(130),
|
||||||
|
options->color(Options::TitleBlend, false),
|
||||||
|
KPixmapEffect::VerticalGradient);
|
||||||
|
// buttons
|
||||||
|
QColor btnColor(options->color(Options::ButtonBg, true));
|
||||||
|
buttonPix = new QPixmap(14, 15);
|
||||||
|
make_button_fx(btnColor, buttonPix);
|
||||||
|
buttonPixDown = new QPixmap(14, 15);
|
||||||
|
make_button_fx(btnColor.light(120), buttonPixDown);
|
||||||
|
|
||||||
|
btnColor = options->color(Options::ButtonBg, false);
|
||||||
|
iButtonPix = new QPixmap(14, 15);
|
||||||
|
make_button_fx(btnColor, iButtonPix);
|
||||||
|
iButtonPixDown = new QPixmap(14, 15);
|
||||||
|
make_button_fx(btnColor.light(120), iButtonPixDown);
|
||||||
|
|
||||||
|
|
||||||
|
if(qGray(btnColor.rgb()) < 100)
|
||||||
|
buttonFg = Qt::white;
|
||||||
|
else
|
||||||
|
buttonFg = Qt::black;
|
||||||
|
}
|
||||||
|
|
||||||
|
ModernButton::ModernButton(Client *parent, const char *name,
|
||||||
|
const unsigned char *bitmap)
|
||||||
|
: QButton(parent, name)
|
||||||
|
{
|
||||||
|
static QBitmap mask(14, 15, bmap_mask_bits, true);
|
||||||
|
resize(14, 15);
|
||||||
|
|
||||||
|
if(bitmap)
|
||||||
|
setBitmap(bitmap);
|
||||||
|
setMask(mask);
|
||||||
|
client = parent;
|
||||||
|
}
|
||||||
|
|
||||||
|
QSize ModernButton::sizeHint() const
|
||||||
|
{
|
||||||
|
return(QSize(14, 15));
|
||||||
|
}
|
||||||
|
|
||||||
|
void ModernButton::reset()
|
||||||
|
{
|
||||||
|
repaint();
|
||||||
|
}
|
||||||
|
|
||||||
|
void ModernButton::setBitmap(const unsigned char *bitmap)
|
||||||
|
{
|
||||||
|
deco = QBitmap(8, 8, bitmap, true);
|
||||||
|
deco.setMask(deco);
|
||||||
|
repaint();
|
||||||
|
}
|
||||||
|
|
||||||
|
void ModernButton::drawButton(QPainter *p)
|
||||||
|
{
|
||||||
|
if(client->isActive()){
|
||||||
|
if(buttonPix)
|
||||||
|
p->drawPixmap(0, 0, isDown() ? *buttonPixDown : *buttonPix);
|
||||||
|
}
|
||||||
|
else{
|
||||||
|
if(iButtonPix)
|
||||||
|
p->drawPixmap(0, 0, isDown() ? *iButtonPixDown : *iButtonPix);
|
||||||
|
}
|
||||||
|
p->setPen(buttonFg);
|
||||||
|
p->drawPixmap(isDown() ? 4 : 3, isDown() ? 5 : 4, deco);
|
||||||
|
}
|
||||||
|
|
||||||
|
void ModernSys::slotReset()
|
||||||
|
{
|
||||||
|
if(aUpperGradient){
|
||||||
|
delete aUpperGradient;
|
||||||
|
delete iUpperGradient;
|
||||||
|
delete buttonPix;
|
||||||
|
delete buttonPixDown;
|
||||||
|
delete iButtonPix;
|
||||||
|
delete iButtonPixDown;
|
||||||
|
}
|
||||||
|
pixmaps_created = false;
|
||||||
|
create_pixmaps();
|
||||||
|
titleBuffer.resize(0, 0);
|
||||||
|
recalcTitleBuffer();
|
||||||
|
button[0]->reset();
|
||||||
|
button[1]->reset();
|
||||||
|
button[2]->reset();
|
||||||
|
button[3]->reset();
|
||||||
|
if(button[4])
|
||||||
|
button[4]->reset();
|
||||||
|
}
|
||||||
|
|
||||||
|
ModernSys::ModernSys( Workspace *ws, WId w, QWidget *parent,
|
||||||
|
const char *name )
|
||||||
|
: Client( ws, w, parent, name, WResizeNoErase )
|
||||||
|
{
|
||||||
|
create_pixmaps();
|
||||||
|
connect(options, SIGNAL(resetClients()), this, SLOT(slotReset()));
|
||||||
|
bool help = providesContextHelp();
|
||||||
|
|
||||||
|
QGridLayout* g = new QGridLayout(this, 0, 0, 2);
|
||||||
|
g->addWidget(windowWrapper(), 1, 1 );
|
||||||
|
g->setRowStretch(1, 10);
|
||||||
|
g->addItem( new QSpacerItem( 0, 0, QSizePolicy::Fixed, QSizePolicy::Expanding ) );
|
||||||
|
|
||||||
|
g->addColSpacing(0, 2);
|
||||||
|
g->addColSpacing(2, 8);
|
||||||
|
|
||||||
|
g->addRowSpacing(2, 8);
|
||||||
|
|
||||||
|
button[0] = new ModernButton(this, "close"/*, close_bits*/);
|
||||||
|
button[1] = new ModernButton(this, "sticky");
|
||||||
|
if(isSticky())
|
||||||
|
button[1]->setBitmap(unsticky_bits);
|
||||||
|
else
|
||||||
|
button[1]->setBitmap(sticky_bits);
|
||||||
|
button[2] = new ModernButton(this, "iconify", iconify_bits);
|
||||||
|
button[3] = new ModernButton(this, "maximize", maximize_bits);
|
||||||
|
if(help){
|
||||||
|
button[4] = new ModernButton(this, "help", question_bits);
|
||||||
|
connect( button[4], SIGNAL( clicked() ), this, ( SLOT( contextHelp() ) ) );
|
||||||
|
}
|
||||||
|
else
|
||||||
|
button[4] = NULL;
|
||||||
|
|
||||||
|
connect( button[0], SIGNAL( clicked() ), this, ( SLOT( closeWindow() ) ) );
|
||||||
|
connect( button[1], SIGNAL( clicked() ), this, ( SLOT( toggleSticky() ) ) );
|
||||||
|
connect( button[2], SIGNAL( clicked() ), this, ( SLOT( iconify() ) ) );
|
||||||
|
connect( button[3], SIGNAL( clicked() ), this, ( SLOT( maximize() ) ) );
|
||||||
|
|
||||||
|
QHBoxLayout* hb = new QHBoxLayout(0);
|
||||||
|
hb->setResizeMode(QLayout::FreeResize);
|
||||||
|
g->addLayout( hb, 0, 1 );
|
||||||
|
//hb->addSpacing(3);
|
||||||
|
hb->addWidget( button[0]);
|
||||||
|
titlebar = new QSpacerItem(10, 16, QSizePolicy::Expanding,
|
||||||
|
QSizePolicy::Minimum);
|
||||||
|
hb->addSpacing(3);
|
||||||
|
hb->addItem(titlebar);
|
||||||
|
hb->addSpacing(3);
|
||||||
|
if(help){
|
||||||
|
hb->addWidget( button[4]);
|
||||||
|
hb->addSpacing(1);
|
||||||
|
}
|
||||||
|
hb->addWidget( button[1]);
|
||||||
|
hb->addSpacing(1);
|
||||||
|
hb->addWidget( button[2]);
|
||||||
|
hb->addSpacing(1);
|
||||||
|
hb->addWidget( button[3]);
|
||||||
|
hb->addSpacing(2);
|
||||||
|
|
||||||
|
setBackgroundMode(NoBackground);
|
||||||
|
recalcTitleBuffer();
|
||||||
|
|
||||||
|
}
|
||||||
|
|
||||||
|
void ModernSys::resizeEvent( QResizeEvent* )
|
||||||
|
{
|
||||||
|
//Client::resizeEvent( e );
|
||||||
|
recalcTitleBuffer();
|
||||||
|
doShape();
|
||||||
|
/*
|
||||||
|
if ( isVisibleToTLW() && !testWFlags( WNorthWestGravity )) {
|
||||||
|
QPainter p( this );
|
||||||
|
QRect t = titlebar->geometry();
|
||||||
|
t.setTop( 0 );
|
||||||
|
QRegion r = rect();
|
||||||
|
r = r.subtract( t );
|
||||||
|
p.setClipRegion( r );
|
||||||
|
p.eraseRect( rect() );
|
||||||
|
}*/
|
||||||
|
}
|
||||||
|
|
||||||
|
void ModernSys::recalcTitleBuffer()
|
||||||
|
{
|
||||||
|
if(oldTitle == caption() && width() == titleBuffer.width())
|
||||||
|
return;
|
||||||
|
QFontMetrics fm(options->font(true));
|
||||||
|
titleBuffer.resize(width(), 18);
|
||||||
|
QPainter p;
|
||||||
|
p.begin(&titleBuffer);
|
||||||
|
if(aUpperGradient)
|
||||||
|
p.drawTiledPixmap(0, 0, width(), 18, *aUpperGradient);
|
||||||
|
else
|
||||||
|
p.fillRect(0, 0, width(), 18,
|
||||||
|
options->colorGroup(Options::TitleBar, true).
|
||||||
|
brush(QColorGroup::Button));
|
||||||
|
|
||||||
|
QRect t = titlebar->geometry();
|
||||||
|
t.setTop( 2 );
|
||||||
|
t.setLeft( t.left() + 4 );
|
||||||
|
t.setRight( t.right() - 2 );
|
||||||
|
|
||||||
|
QRegion r(t.x(), 0, t.width(), 18);
|
||||||
|
r -= QRect(t.x()+((t.width()-fm.width(caption()))/2)-4,
|
||||||
|
0, fm.width(caption())+8, 18);
|
||||||
|
p.setClipRegion(r);
|
||||||
|
int i, ly;
|
||||||
|
for(i=0, ly=4; i < 4; ++i, ly+=3){
|
||||||
|
p.setPen(options->color(Options::TitleBar, true).light(150));
|
||||||
|
p.drawLine(0, ly, width()-1, ly);
|
||||||
|
p.setPen(options->color(Options::TitleBar, true).dark(120));
|
||||||
|
p.drawLine(0, ly+1, width()-1, ly+1);
|
||||||
|
}
|
||||||
|
p.setClipRect(t);
|
||||||
|
p.setPen(options->color(Options::Font, true));
|
||||||
|
p.setFont(options->font(true));
|
||||||
|
|
||||||
|
p.drawText(t.x()+((t.width()-fm.width(caption()))/2)-4,
|
||||||
|
0, fm.width(caption())+8, 18, AlignCenter, caption());
|
||||||
|
p.setClipping(false);
|
||||||
|
p.end();
|
||||||
|
oldTitle = caption();
|
||||||
|
}
|
||||||
|
|
||||||
|
void ModernSys::captionChange( const QString &)
|
||||||
|
{
|
||||||
|
recalcTitleBuffer();
|
||||||
|
repaint( titlebar->geometry(), false );
|
||||||
|
}
|
||||||
|
|
||||||
|
void ModernSys::drawRoundFrame(QPainter &p, int x, int y, int w, int h)
|
||||||
|
{
|
||||||
|
kDrawRoundButton(&p, x, y, w, h,
|
||||||
|
options->colorGroup(Options::Frame, isActive()), false);
|
||||||
|
|
||||||
|
}
|
||||||
|
|
||||||
|
void ModernSys::paintEvent( QPaintEvent* )
|
||||||
|
{
|
||||||
|
QPainter p( this );
|
||||||
|
QRect t = titlebar->geometry();
|
||||||
|
|
||||||
|
QBrush fillBrush(colorGroup().brush(QColorGroup::Background).pixmap() ?
|
||||||
|
colorGroup().brush(QColorGroup::Background) :
|
||||||
|
options->colorGroup(Options::Frame, isActive()).
|
||||||
|
brush(QColorGroup::Button));
|
||||||
|
|
||||||
|
p.fillRect(1, 16, width()-2, height()-16, fillBrush);
|
||||||
|
|
||||||
|
t.setTop( 2 );
|
||||||
|
t.setLeft( t.left() + 4 );
|
||||||
|
t.setRight( t.right() - 2 );
|
||||||
|
|
||||||
|
int w = width()-6; // exclude handle
|
||||||
|
int h = height()-6;
|
||||||
|
|
||||||
|
// titlebar
|
||||||
|
QColorGroup g = options->colorGroup(Options::TitleBar, isActive());
|
||||||
|
if(isActive()){
|
||||||
|
p.drawPixmap(1, 1, titleBuffer);
|
||||||
|
}
|
||||||
|
else{
|
||||||
|
if(iUpperGradient)
|
||||||
|
p.drawTiledPixmap(1, 1, w-2, 18, *iUpperGradient);
|
||||||
|
else
|
||||||
|
p.fillRect(1, 1, w-2, 18, fillBrush);
|
||||||
|
p.setPen(options->color(Options::GrooveText, isActive()));
|
||||||
|
p.setFont(options->font(isActive()));
|
||||||
|
p.drawText(t, AlignCenter, caption() );
|
||||||
|
}
|
||||||
|
|
||||||
|
// titlebar highlight
|
||||||
|
p.setPen(g.light());
|
||||||
|
p.drawLine(1, 1, 1, 19);
|
||||||
|
p.drawLine(1, 1, w-3, 1);
|
||||||
|
p.setPen(g.dark());
|
||||||
|
p.drawLine(w-2, 1, w-2, 19);
|
||||||
|
p.drawLine(0, 18, w-2, 18);
|
||||||
|
|
||||||
|
// frame
|
||||||
|
g = options->colorGroup(Options::Frame, isActive());
|
||||||
|
p.setPen(g.light());
|
||||||
|
p.drawLine(1, 19, 1, h-2);
|
||||||
|
p.setPen(g.dark());
|
||||||
|
p.drawLine(2, h-2, w-2, h-2);
|
||||||
|
p.drawLine(w-2, 19, w-2, h-2);
|
||||||
|
//p.drawPoint(w-3, 19);
|
||||||
|
//p.drawPoint(2, 19);
|
||||||
|
|
||||||
|
qDrawShadePanel(&p, 3, 19, w-6, h-22, g, true);
|
||||||
|
|
||||||
|
// handle
|
||||||
|
p.setPen(g.dark());
|
||||||
|
p.drawLine(width()-3, height()-29, width()-3, height()-3);
|
||||||
|
p.drawLine(width()-29, height()-3, width()-3, height()-3);
|
||||||
|
|
||||||
|
p.setPen(g.light());
|
||||||
|
p.drawLine(width()-6, height()-29, width()-6, height()-6);
|
||||||
|
p.drawLine(width()-29, height()-6, width()-6, height()-6);
|
||||||
|
p.drawLine(width()-6, height()-29, width()-4, height()-29);
|
||||||
|
p.drawLine(width()-29, height()-6, width()-29, height()-4);
|
||||||
|
|
||||||
|
|
||||||
|
p.setPen(Qt::black);
|
||||||
|
p.drawRect(0, 0, w, h);
|
||||||
|
|
||||||
|
// handle outline
|
||||||
|
p.drawLine(width()-6, height()-30, width(), height()-30);
|
||||||
|
p.drawLine(width()-2, height()-30, width()-2, height()-2);
|
||||||
|
p.drawLine(width()-30, height()-2, width()-2, height()-2);
|
||||||
|
p.drawLine(width()-30, height()-6, width()-30, height()-2);
|
||||||
|
|
||||||
|
|
||||||
|
}
|
||||||
|
|
||||||
|
#define QCOORDARRLEN(x) sizeof(x)/(sizeof(QCOORD)*2)
|
||||||
|
|
||||||
|
void ModernSys::doShape()
|
||||||
|
{
|
||||||
|
QRegion mask;
|
||||||
|
mask += QRect(0, 0, width()-6, height()-6);
|
||||||
|
mask += QRect(width()-30, height()-30, 29, 29);
|
||||||
|
//single points
|
||||||
|
mask -= QRect(0, 0, 1, 1);
|
||||||
|
mask -= QRect(width()-7, 0, 1, 1);
|
||||||
|
mask -= QRect(0, height()-7, 1, 1);
|
||||||
|
mask -= QRect(width()-2, height()-2, 1, 1);
|
||||||
|
mask -= QRect(width()-2, height()-30, 1, 1);
|
||||||
|
mask -= QRect(width()-30, height()-2, 1, 1);
|
||||||
|
|
||||||
|
setMask(mask);
|
||||||
|
}
|
||||||
|
|
||||||
|
void ModernSys::showEvent(QShowEvent *ev)
|
||||||
|
{
|
||||||
|
Client::showEvent(ev);
|
||||||
|
doShape();
|
||||||
|
repaint();
|
||||||
|
}
|
||||||
|
|
||||||
|
void ModernSys::windowWrapperShowEvent( QShowEvent* )
|
||||||
|
{
|
||||||
|
doShape();
|
||||||
|
}
|
||||||
|
|
||||||
|
void ModernSys::mouseDoubleClickEvent( QMouseEvent * e )
|
||||||
|
{
|
||||||
|
if (titlebar->geometry().contains( e->pos() ) )
|
||||||
|
setShade( !isShade() );
|
||||||
|
workspace()->requestFocus( this );
|
||||||
|
}
|
||||||
|
|
||||||
|
void ModernSys::stickyChange(bool on)
|
||||||
|
{
|
||||||
|
button[1]->setBitmap(on ? unsticky_bits : sticky_bits);
|
||||||
|
}
|
||||||
|
|
||||||
|
void ModernSys::maximizeChange(bool m)
|
||||||
|
{
|
||||||
|
button[3]->setBitmap(m ? minmax_bits : maximize_bits);
|
||||||
|
}
|
||||||
|
|
||||||
|
void ModernSys::init()
|
||||||
|
{
|
||||||
|
//
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
60
clients/modernsystem/modernsys.h
Normal file
60
clients/modernsystem/modernsys.h
Normal file
|
|
@ -0,0 +1,60 @@
|
||||||
|
#ifndef __MODSYSTEMCLIENT_H
|
||||||
|
#define __MODSYSTEMCLIENT_H
|
||||||
|
|
||||||
|
#include <qbutton.h>
|
||||||
|
#include <qbitmap.h>
|
||||||
|
#include <kpixmap.h>
|
||||||
|
#include "../../client.h"
|
||||||
|
class QLabel;
|
||||||
|
class QSpacerItem;
|
||||||
|
|
||||||
|
|
||||||
|
// get rid of autohide :P
|
||||||
|
class ModernButton : public QButton
|
||||||
|
{
|
||||||
|
public:
|
||||||
|
ModernButton(Client *parent=0, const char *name=0,
|
||||||
|
const unsigned char *bitmap=NULL);
|
||||||
|
void setBitmap(const unsigned char *bitmap);
|
||||||
|
void reset();
|
||||||
|
QSize sizeHint() const;
|
||||||
|
protected:
|
||||||
|
virtual void drawButton(QPainter *p);
|
||||||
|
void drawButtonLabel(QPainter *){;}
|
||||||
|
QBitmap deco;
|
||||||
|
Client *client;
|
||||||
|
};
|
||||||
|
|
||||||
|
class ModernSys : public Client
|
||||||
|
{
|
||||||
|
Q_OBJECT
|
||||||
|
public:
|
||||||
|
ModernSys( Workspace *ws, WId w, QWidget *parent=0, const char *name=0 );
|
||||||
|
~ModernSys(){;}
|
||||||
|
protected:
|
||||||
|
void drawRoundFrame(QPainter &p, int x, int y, int w, int h);
|
||||||
|
void resizeEvent( QResizeEvent* );
|
||||||
|
void paintEvent( QPaintEvent* );
|
||||||
|
void showEvent( QShowEvent* );
|
||||||
|
void windowWrapperShowEvent( QShowEvent* );
|
||||||
|
void mouseDoubleClickEvent( QMouseEvent * );
|
||||||
|
void init();
|
||||||
|
void captionChange( const QString& name );
|
||||||
|
void stickyChange(bool on);
|
||||||
|
void maximizeChange(bool m);
|
||||||
|
void doShape();
|
||||||
|
void recalcTitleBuffer();
|
||||||
|
protected slots:
|
||||||
|
void slotReset();
|
||||||
|
private:
|
||||||
|
ModernButton* button[5];
|
||||||
|
QSpacerItem* titlebar;
|
||||||
|
QPixmap titleBuffer;
|
||||||
|
QString oldTitle;
|
||||||
|
};
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
#endif
|
||||||
3
clients/modernsystem/modernsystem.desktop
Normal file
3
clients/modernsystem/modernsystem.desktop
Normal file
|
|
@ -0,0 +1,3 @@
|
||||||
|
[Desktop Entry]
|
||||||
|
Name=ModSystem (High color usage)
|
||||||
|
X-KDE-Library=libkwinmodernsys
|
||||||
Loading…
Reference in a new issue