alecs/plasma-framework
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

fix the border disable logic

Browse Source
This commit is contained in:
Marco Martin 2012-07-12 11:58:58 +02:00
parent e571a8ea6e
commit 8c8d4bfb09
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
dialog.cpp
View File

@ -171,7 +171,9 @@ void DialogPrivate::checkBorders(bool updateMaskIfNeeded)
qreal bottomHeight(0); qreal bottomHeight(0);
//decide about disabling the border attached to the panel //decide about disabling the border attached to the panel
if (applet && !(q->windowFlags() & Qt::ToolTip)) { //don't cut borders on tooltips
//Qt::ToolTip is 0xc & Qt::Window, so Qt::Window has to be considered
if (applet && (q->windowFlags() & Qt::ToolTip) != Qt::ToolTip) {
background->getMargins(leftWidth, topHeight, rightWidth, bottomHeight); background->getMargins(leftWidth, topHeight, rightWidth, bottomHeight);
switch (applet->location()) { switch (applet->location()) {
@ -223,7 +225,7 @@ void DialogPrivate::checkBorders(bool updateMaskIfNeeded)
} }
//decide if to disable the other borders //decide if to disable the other borders
if (q->isVisible() && !(q->windowFlags() & Qt::ToolTip)) { if (q->isVisible() && (q->windowFlags() & Qt::ToolTip) != Qt::ToolTip) {
if (dialogGeom.left() <= avail.left()) { if (dialogGeom.left() <= avail.left()) {
borders &= ~FrameSvg::LeftBorder; borders &= ~FrameSvg::LeftBorder;
} }