Fixed glitch on first uresizable window opening.
svn path=/trunk/kdebase/kwin/; revision=349364
This commit is contained in:
parent
d1670b617a
commit
136f98c24e
2 changed files with 5 additions and 3 deletions
|
@ -77,6 +77,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;
|
static bool do_draw_handle = true;
|
||||||
|
static bool drawSmallBorders = false;
|
||||||
|
|
||||||
// =====================================
|
// =====================================
|
||||||
|
|
||||||
|
@ -105,6 +106,8 @@ static void read_config(B2ClientFactory *f)
|
||||||
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);
|
do_draw_handle = conf.readBoolEntry("DrawGrabHandle", true);
|
||||||
|
drawSmallBorders = !options()->moveResizeMaximizedWindows();
|
||||||
|
|
||||||
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;
|
||||||
|
@ -498,11 +501,10 @@ void B2Client::addButtons(const QString& s, const QString tips[],
|
||||||
|
|
||||||
bool B2Client::mustDrawHandle() const
|
bool B2Client::mustDrawHandle() const
|
||||||
{
|
{
|
||||||
bool drawSmallBorders = !options()->moveResizeMaximizedWindows();
|
|
||||||
if (drawSmallBorders && (maximizeMode() & MaximizeVertical)) {
|
if (drawSmallBorders && (maximizeMode() & MaximizeVertical)) {
|
||||||
return false;
|
return false;
|
||||||
} else {
|
} else {
|
||||||
return draw_handle && isResizable();
|
return do_draw_handle && isResizable();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -694,6 +696,7 @@ void B2Client::doShape()
|
||||||
mask -= QRect(0, height() - 4, width() - 40, 4); //bottom left
|
mask -= QRect(0, height() - 4, width() - 40, 4); //bottom left
|
||||||
} else {
|
} else {
|
||||||
mask -= QRect(0, height() - 1, 1, 1); // bottom left point
|
mask -= QRect(0, height() - 1, 1, 1); // bottom left point
|
||||||
|
mask -= QRect(width() - 1, height() - 1, 1, 1); //bottom right point
|
||||||
}
|
}
|
||||||
|
|
||||||
setMask(mask);
|
setMask(mask);
|
||||||
|
|
|
@ -144,7 +144,6 @@ 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
|
||||||
|
|
Loading…
Reference in a new issue