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

Added an option to disable the grab handle (The checkmark actually asks if the

Browse source 
handle has to be drawn, and it's on by default).
Added support for a new titlebar button "R" for Resize.
I have a patch pending for the kwin kcm to add that too.

svn path=/trunk/kdebase/kwin/; revision=322119
This commit is contained in:
Luciano Montanaro 2004-06-20 10:03:04 +00:00
parent 9f6d0202f0
commit 22f4d1dced
4 changed files with 79 additions and 24 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

75
clients/b2/b2client.cpp
View file

@ -39,7 +39,7 @@ enum {
enum { enum {
P_CLOSE = 0, P_CLOSE = 0,
P_MAX, P_NORMALIZE, P_ICONIFY, P_PINUP, P_MENU, P_HELP, P_SHADE, P_MAX, P_NORMALIZE, P_ICONIFY, P_PINUP, P_MENU, P_HELP, P_SHADE, P_RESIZE,
P_NUM_BUTTON_TYPES P_NUM_BUTTON_TYPES
}; };
@ -76,6 +76,7 @@ static DblClickOperation menu_dbl_click_op = NoOp;
static bool pixmaps_created = false; static bool pixmaps_created = false;
static bool colored_frame = false; static bool colored_frame = false;
static bool do_draw_handle = true;
// ===================================== // =====================================
@ -103,6 +104,7 @@ static void read_config(B2ClientFactory *f)
KConfig conf("kwinb2rc"); KConfig conf("kwinb2rc");
conf.setGroup("General"); conf.setGroup("General");
colored_frame = conf.readBoolEntry("UseTitleBarBorderColors", false); colored_frame = conf.readBoolEntry("UseTitleBarBorderColors", false);
do_draw_handle = conf.readBoolEntry("DrawGrabHandle", true);
QString opString = conf.readEntry("MenuButtonDoubleClickOperation", "NoOp"); QString opString = conf.readEntry("MenuButtonDoubleClickOperation", "NoOp");
if (opString == "Close") { if (opString == "Close") {
menu_dbl_click_op = B2::CloseOp; menu_dbl_click_op = B2::CloseOp;
@ -151,13 +153,13 @@ static void drawB2Rect(KPixmap *pix, const QColor &primary, bool down)
} }
else else
pix->fill(primary); pix->fill(primary);
int x2 = pix->width()-1; int x2 = pix->width() - 1;
int y2 = pix->height()-1; int y2 = pix->height() - 1;
p.setPen(down ? hColor : lColor); p.setPen(down ? hColor : lColor);
p.drawLine(0, 0, x2, 0); p.drawLine(0, 0, x2, 0);
p.drawLine(0, 0, 0, y2); p.drawLine(0, 0, 0, y2);
p.drawLine(1, x2-1, x2-1, y2-1); p.drawLine(1, x2 - 1, x2 - 1, y2 - 1);
p.drawLine(x2-1, 1, x2-1, y2-1); p.drawLine(x2 - 1, 1, x2 - 1, y2 - 1);
p.setPen(down ? lColor : hColor); p.setPen(down ? lColor : hColor);
p.drawRect(1, 1, x2, y2); p.drawRect(1, 1, x2, y2);
@ -183,6 +185,7 @@ static void create_pixmaps()
pixmap[i] = new KPixmap; pixmap[i] = new KPixmap;
switch (i / NumStates) { switch (i / NumStates) {
case P_MAX: // will be initialized by copying P_CLOSE case P_MAX: // will be initialized by copying P_CLOSE
case P_RESIZE:
break; break;
case P_ICONIFY: case P_ICONIFY:
pixmap[i]->resize(10, 10); break; pixmap[i]->resize(10, 10); break;
@ -315,6 +318,11 @@ void B2Client::shadeButtonClicked()
setShade(!isShade()); setShade(!isShade());
} }
void B2Client::resizeButtonClicked()
{
performWindowOperation(ResizeOp);
}
B2Client::B2Client(KDecorationBridge *b, KDecorationFactory *f) B2Client::B2Client(KDecorationBridge *b, KDecorationFactory *f)
: KDecoration(b, f), bar_x_ofs(0), in_unobs(0) : KDecoration(b, f), bar_x_ofs(0), in_unobs(0)
{ {
@ -322,13 +330,15 @@ B2Client::B2Client(KDecorationBridge *b, KDecorationFactory *f)
void B2Client::init() void B2Client::init()
{ {
draw_handle = do_draw_handle;
const QString tips[] = { const QString tips[] = {
i18n("Menu"), i18n("Menu"),
isOnAllDesktops() ? isOnAllDesktops() ?
i18n("Not On All Desktops") : i18n("On All desktops"), i18n("Not On All Desktops") : i18n("On All desktops"),
i18n("Minimize"), i18n("Maximize"), i18n("Minimize"), i18n("Maximize"),
i18n("Close"), i18n("Help"), i18n("Close"), i18n("Help"),
isShade() ? i18n("Unshade") : i18n("Shade") isShade() ? i18n("Unshade") : i18n("Shade"),
i18n("Resize")
}; };
createMainWidget(WResizeNoErase | WRepaintNoErase); createMainWidget(WResizeNoErase | WRepaintNoErase);
@ -363,7 +373,7 @@ void B2Client::init()
g->addItem(rightSpacer, 1, 3); g->addItem(rightSpacer, 1, 3);
// Bottom border height // Bottom border height
spacer = new QSpacerItem(10, thickness + (isResizable() ? 4 : 0), spacer = new QSpacerItem(10, thickness + (mustDrawHandle() ? 4 : 0),
QSizePolicy::Expanding, QSizePolicy::Minimum); QSizePolicy::Expanding, QSizePolicy::Minimum);
g->addItem(spacer, 3, 1); g->addItem(spacer, 3, 1);
@ -443,7 +453,7 @@ void B2Client::addButtons(const QString& s, const QString tips[],
break; break;
case 'I': // Minimize button case 'I': // Minimize button
if (isMinimizable() && (!button[BtnIconify])) { if (isMinimizable() && (!button[BtnIconify])) {
button[BtnIconify]= new B2Button(this, tb,tips[BtnIconify]); button[BtnIconify] = new B2Button(this, tb,tips[BtnIconify]);
button[BtnIconify]->setPixmaps(P_ICONIFY); button[BtnIconify]->setPixmaps(P_ICONIFY);
connect(button[BtnIconify], SIGNAL(clicked()), connect(button[BtnIconify], SIGNAL(clicked()),
this, SLOT(minimize())); this, SLOT(minimize()));
@ -452,7 +462,7 @@ void B2Client::addButtons(const QString& s, const QString tips[],
break; break;
case 'A': // Maximize button case 'A': // Maximize button
if (isMaximizable() && (!button[BtnMax])) { if (isMaximizable() && (!button[BtnMax])) {
button[BtnMax]= new B2Button(this, tb, tips[BtnMax], button[BtnMax] = new B2Button(this, tb, tips[BtnMax],
LeftButton | MidButton | RightButton); LeftButton | MidButton | RightButton);
button[BtnMax]->setPixmaps(maximizeMode() == MaximizeFull ? button[BtnMax]->setPixmaps(maximizeMode() == MaximizeFull ?
P_NORMALIZE : P_MAX); P_NORMALIZE : P_MAX);
@ -463,7 +473,7 @@ void B2Client::addButtons(const QString& s, const QString tips[],
break; break;
case 'X': // Close button case 'X': // Close button
if (isCloseable() && !button[BtnClose]) { if (isCloseable() && !button[BtnClose]) {
button[BtnClose]= new B2Button(this, tb, tips[BtnClose]); button[BtnClose] = new B2Button(this, tb, tips[BtnClose]);
button[BtnClose]->setPixmaps(P_CLOSE); button[BtnClose]->setPixmaps(P_CLOSE);
connect(button[BtnClose], SIGNAL(clicked()), connect(button[BtnClose], SIGNAL(clicked()),
this, SLOT(closeWindow())); this, SLOT(closeWindow()));
@ -472,13 +482,22 @@ void B2Client::addButtons(const QString& s, const QString tips[],
break; break;
case 'L': // Shade button case 'L': // Shade button
if (isShadeable() && !button[BtnShade]) { if (isShadeable() && !button[BtnShade]) {
button[BtnShade]= new B2Button(this, tb, tips[BtnShade]); button[BtnShade] = new B2Button(this, tb, tips[BtnShade]);
button[BtnShade]->setPixmaps(P_SHADE); button[BtnShade]->setPixmaps(P_SHADE);
connect(button[BtnShade], SIGNAL(clicked()), connect(button[BtnShade], SIGNAL(clicked()),
this, SLOT(shadeButtonClicked())); this, SLOT(shadeButtonClicked()));
titleLayout->addWidget(button[BtnShade]); titleLayout->addWidget(button[BtnShade]);
} }
break; break;
case 'R': // Resize button
if (isResizable() && !button[BtnResize]) {
button[BtnResize] = new B2Button(this, tb, tips[BtnResize]);
button[BtnResize]->setPixmaps(P_RESIZE);
connect(button[BtnResize], SIGNAL(clicked()),
this, SLOT(resizeButtonClicked()));
titleLayout->addWidget(button[BtnResize]);
}
break;
case '_': // Additional spacing case '_': // Additional spacing
titleLayout->addSpacing(4); titleLayout->addSpacing(4);
break; break;
@ -498,9 +517,9 @@ void B2Client::iconChange()
void B2Client::calcHiddenButtons() void B2Client::calcHiddenButtons()
{ {
// Hide buttons in this order: // Hide buttons in this order:
// Shade, Sticky, Help, Maximize, Minimize, Close, Menu // Shade, Sticky, Help, Resize, Maximize, Minimize, Close, Menu
B2Button* btnArray[] = { B2Button* btnArray[] = {
button[BtnShade], button[BtnSticky], button[BtnHelp], button[BtnShade], button[BtnSticky], button[BtnHelp], button[BtnResize],
button[BtnMax], button[BtnIconify], button[BtnClose], button[BtnMenu] button[BtnMax], button[BtnIconify], button[BtnClose], button[BtnMenu]
}; };
int minWidth = 120; int minWidth = 120;
@ -564,7 +583,7 @@ void B2Client::paintEvent(QPaintEvent* e)
int fHeight = height() - t.height(); int fHeight = height() - t.height();
// distance from the bottom border - it is different if window is resizable // distance from the bottom border - it is different if window is resizable
int bb = isResizable() ? 4 : 0; int bb = mustDrawHandle() ? 4 : 0;
int bDepth = thickness + bb; int bDepth = thickness + bb;
QColorGroup fillColor = options()->colorGroup(frameColorGroup, isActive()); QColorGroup fillColor = options()->colorGroup(frameColorGroup, isActive());
@ -607,7 +626,7 @@ void B2Client::paintEvent(QPaintEvent* e)
} }
// bottom handle rect // bottom handle rect
if (isResizable()) { if (mustDrawHandle()) {
p.setPen(Qt::black); p.setPen(Qt::black);
int hx = width() - 40; int hx = width() - 40;
int hw = 40; int hw = 40;
@ -668,7 +687,7 @@ void B2Client::doShape()
width() - t.right() - 1, t.height() - thickness); width() - t.right() - 1, t.height() - thickness);
} }
mask -= QRect(width() - 1, height() - 1, 1, 1); //bottom right point mask -= QRect(width() - 1, height() - 1, 1, 1); //bottom right point
if (isResizable()) { if (mustDrawHandle()) {
mask -= QRect(0, height() - 5, 1, 1); //bottom left point mask -= QRect(0, height() - 5, 1, 1); //bottom left point
mask -= QRect(width() - 1, height() - 1, 1, 1); //bottom right point mask -= QRect(width() - 1, height() - 1, 1, 1); //bottom right point
mask -= QRect(width() - 40, height() - 1, 1, 1); //handle left point mask -= QRect(width() - 40, height() - 1, 1, 1); //handle left point
@ -695,7 +714,7 @@ KDecoration::Position B2Client::mousePosition(const QPoint& p) const
t.setHeight(buttonSize + 4 - thickness); t.setHeight(buttonSize + 4 - thickness);
int ly = t.bottom(); int ly = t.bottom();
int lx = t.right(); int lx = t.right();
int bb = isResizable() ? 0 : 5; int bb = mustDrawHandle() ? 0 : 5;
if (p.x() > t.right()) { if (p.x() > t.right()) {
if (p.y() <= ly + range && p.x() >= width() - range) if (p.y() <= ly + range && p.x() >= width() - range)
@ -776,7 +795,7 @@ void B2Client::maximizeChange()
QToolTip::add(button[BtnMax], QToolTip::add(button[BtnMax],
m ? i18n("Restore") : i18n("Maximize")); m ? i18n("Restore") : i18n("Maximize"));
} }
spacer->changeSize(10, thickness + (isResizable() ? 4 : 0), spacer->changeSize(10, thickness + (mustDrawHandle() ? 4 : 0),
QSizePolicy::Expanding, QSizePolicy::Minimum); QSizePolicy::Expanding, QSizePolicy::Minimum);
g->activate(); g->activate();
@ -801,7 +820,7 @@ void B2Client::activeChange()
void B2Client::shadeChange() void B2Client::shadeChange()
{ {
spacer->changeSize(10, thickness + (isResizable() ? 4 : 0), spacer->changeSize(10, thickness + (mustDrawHandle() ? 4 : 0),
QSizePolicy::Expanding, QSizePolicy::Minimum); QSizePolicy::Expanding, QSizePolicy::Minimum);
g->activate(); g->activate();
doShape(); doShape();
@ -827,7 +846,7 @@ void B2Client::borders(int &left, int &right, int &top, int &bottom) const
{ {
left = right = thickness; left = right = thickness;
top = buttonSize + 4; top = buttonSize + 4;
bottom = thickness + (isResizable() ? 4 : 0); bottom = thickness + (mustDrawHandle() ? 4 : 0);
} }
void B2Client::menuButtonPressed() void B2Client::menuButtonPressed()
@ -921,14 +940,14 @@ static void redraw_pixmaps()
*pixmap[P_MAX * NumStates + i] = *pixmap[P_CLOSE * NumStates + i]; *pixmap[P_MAX * NumStates + i] = *pixmap[P_CLOSE * NumStates + i];
pixmap[P_MAX * NumStates + i]->detach(); pixmap[P_MAX * NumStates + i]->detach();
} }
// normalize + iconify // normalize + iconify
KPixmap smallBox; KPixmap smallBox;
smallBox.resize(10, 10); smallBox.resize(10, 10);
KPixmap largeBox; KPixmap largeBox;
largeBox.resize(12, 12); largeBox.resize(12, 12);
for (i = 0; i < 6; i++) { for (i = 0; i < NumStates; i++) {
bool is_act = (i < 3); bool is_act = (i < 3);
bool is_down = (i == Down || i == IDown); bool is_down = (i == Down || i == IDown);
KPixmap *pix = pixmap[P_NORMALIZE * NumStates + i]; KPixmap *pix = pixmap[P_NORMALIZE * NumStates + i];
@ -942,6 +961,18 @@ static void redraw_pixmaps()
bitBlt(pixmap[P_ICONIFY * NumStates + i], 0, 0, bitBlt(pixmap[P_ICONIFY * NumStates + i], 0, 0,
&smallBox, 0, 0, 10, 10, Qt::CopyROP, true); &smallBox, 0, 0, 10, 10, Qt::CopyROP, true);
} }
// resize
for (i = 0; i < NumStates; i++) {
bool is_act = (i < 3);
bool is_down = (i == Down || i == IDown);
*pixmap[P_RESIZE * NumStates + i] = *pixmap[P_CLOSE * NumStates + i];
pixmap[P_RESIZE * NumStates + i]->detach();
drawB2Rect(&smallBox, is_act ? aGrp.button() : iGrp.button(), is_down);
bitBlt(pixmap[P_RESIZE * NumStates + i],
0, 0, &smallBox, 0, 0, 10, 10, Qt::CopyROP, true);
}
QPainter p; QPainter p;
// x for close + menu + help // x for close + menu + help

6
clients/b2/b2client.h
View file

@ -125,13 +125,16 @@ private slots:
//void slotReset(); //void slotReset();
void maxButtonClicked(); void maxButtonClicked();
void shadeButtonClicked(); void shadeButtonClicked();
void resizeButtonClicked();
private: private:
void addButtons(const QString& s, const QString tips[], void addButtons(const QString& s, const QString tips[],
B2Titlebar* tb, QBoxLayout* titleLayout); B2Titlebar* tb, QBoxLayout* titleLayout);
void positionButtons(); void positionButtons();
void calcHiddenButtons(); void calcHiddenButtons();
bool mustDrawHandle() const { return draw_handle && isResizable(); }
enum ButtonType{BtnMenu=0, BtnSticky, BtnIconify, BtnMax, BtnClose, enum ButtonType{BtnMenu=0, BtnSticky, BtnIconify, BtnMax, BtnClose,
BtnHelp, BtnShade, BtnCount}; BtnHelp, BtnShade, BtnResize, BtnCount};
B2Button* button[BtnCount]; B2Button* button[BtnCount];
QGridLayout *g; QGridLayout *g;
QSpacerItem *spacer; // Bottom border spacer QSpacerItem *spacer; // Bottom border spacer
@ -141,6 +144,7 @@ private:
int bar_x_ofs; int bar_x_ofs;
int in_unobs; int in_unobs;
QTime time; QTime time;
bool draw_handle;
}; };
class B2ClientFactory : public QObject, public KDecorationFactory class B2ClientFactory : public QObject, public KDecorationFactory

21
clients/b2/config/config.cpp
View file

@ -36,12 +36,21 @@ B2Config::B2Config( KConfig* conf, QWidget* parent )
KGlobal::locale()->insertCatalogue("kwin_b2_config"); KGlobal::locale()->insertCatalogue("kwin_b2_config");
b2Config = new KConfig("kwinb2rc"); b2Config = new KConfig("kwinb2rc");
gb = new QVBox(parent); gb = new QVBox(parent);
cbColorBorder = new QCheckBox( cbColorBorder = new QCheckBox(
i18n("Draw window frames using &titlebar colors"), gb); i18n("Draw window frames using &titlebar colors"), gb);
QWhatsThis::add(cbColorBorder, QWhatsThis::add(cbColorBorder,
i18n("When selected, the window decoration borders " i18n("When selected, the window decoration borders "
"are drawn using the titlebar colors. Otherwise, they are " "are drawn using the titlebar colors. Otherwise, they are "
"drawn using normal border colors instead.")); "drawn using normal border colors instead."));
// Grab Handle
showGrabHandleCb = new QCheckBox(
i18n("Draw &resize handle"), gb);
QWhatsThis::add(showGrabHandleCb,
i18n("When selected, decorations are drawn with a \"grab handle\" "
"in the bottom left corner of the windows. Otherwise, no grab handle is drawn."));
// Double click menu option support // Double click menu option support
actionsGB = new QHGroupBox(i18n("Actions Settings"), gb); actionsGB = new QHGroupBox(i18n("Actions Settings"), gb);
QLabel *menuDblClickLabel = new QLabel(actionsGB); QLabel *menuDblClickLabel = new QLabel(actionsGB);
@ -55,12 +64,15 @@ B2Config::B2Config( KConfig* conf, QWidget* parent )
QWhatsThis::add(menuDblClickOp, QWhatsThis::add(menuDblClickOp,
i18n("An action can be associated to a double click " i18n("An action can be associated to a double click "
"of the menu button. Leave it to none if in doubt.")); "of the menu button. Leave it to none if in doubt."));
// Load configuration options // Load configuration options
load(conf); load(conf);
// Ensure we track user changes properly // Ensure we track user changes properly
connect(cbColorBorder, SIGNAL(clicked()), connect(cbColorBorder, SIGNAL(clicked()),
this, SLOT(slotSelectionChanged())); this, SLOT(slotSelectionChanged()));
connect(showGrabHandleCb, SIGNAL(clicked()),
this, SLOT(slotSelectionChanged()));
connect(menuDblClickOp, SIGNAL(activated(int)), connect(menuDblClickOp, SIGNAL(activated(int)),
this, SLOT(slotSelectionChanged())); this, SLOT(slotSelectionChanged()));
// Make the widgets visible in kwindecoration // Make the widgets visible in kwindecoration
@ -86,8 +98,13 @@ void B2Config::slotSelectionChanged()
void B2Config::load(KConfig * /*conf*/) void B2Config::load(KConfig * /*conf*/)
{ {
b2Config->setGroup("General"); b2Config->setGroup("General");
bool override = b2Config->readBoolEntry("UseTitleBarBorderColors", false); bool override = b2Config->readBoolEntry("UseTitleBarBorderColors", false);
cbColorBorder->setChecked(override); cbColorBorder->setChecked(override);
override = b2Config->readBoolEntry( "DrawGrabHandle", true );
showGrabHandleCb->setChecked(override);
QString returnString = b2Config->readEntry( QString returnString = b2Config->readEntry(
"MenuButtonDoubleClickOperation", "NoOp"); "MenuButtonDoubleClickOperation", "NoOp");
@ -127,6 +144,7 @@ void B2Config::save(KConfig * /*conf*/)
{ {
b2Config->setGroup("General"); b2Config->setGroup("General");
b2Config->writeEntry("UseTitleBarBorderColors", cbColorBorder->isChecked()); b2Config->writeEntry("UseTitleBarBorderColors", cbColorBorder->isChecked());
b2Config->writeEntry("DrawGrabHandle", showGrabHandleCb->isChecked());
b2Config->writeEntry("MenuButtonDoubleClickOperation", b2Config->writeEntry("MenuButtonDoubleClickOperation",
opToString(menuDblClickOp->currentItem())); opToString(menuDblClickOp->currentItem()));
// Ensure others trying to read this config get updated // Ensure others trying to read this config get updated
@ -137,7 +155,8 @@ void B2Config::save(KConfig * /*conf*/)
// Sets UI widget defaults which must correspond to style defaults // Sets UI widget defaults which must correspond to style defaults
void B2Config::defaults() void B2Config::defaults()
{ {
cbColorBorder->setChecked( false ); cbColorBorder->setChecked(false);
showGrabHandleCb->setChecked(true);
menuDblClickOp->setCurrentItem(0); menuDblClickOp->setCurrentItem(0);
} }

1
clients/b2/config/config.h
View file

@ -39,6 +39,7 @@ class B2Config: public QObject
private: private:
KConfig* b2Config; KConfig* b2Config;
QCheckBox* cbColorBorder; QCheckBox* cbColorBorder;
QCheckBox* showGrabHandleCb;
QHGroupBox* actionsGB; QHGroupBox* actionsGB;
QComboBox* menuDblClickOp; QComboBox* menuDblClickOp;
QWidget* gb; QWidget* gb;