fix extenders appearance broken in the last commit
svn path=/trunk/KDE/kdelibs/; revision=939772
This commit is contained in:
parent
9b4cc44046
commit
ce6ac2d4d3
15
dialog.cpp
15
dialog.cpp
@ -108,15 +108,25 @@ void DialogPrivate::themeUpdated()
|
|||||||
switch (extender->d->applet->location()) {
|
switch (extender->d->applet->location()) {
|
||||||
case BottomEdge:
|
case BottomEdge:
|
||||||
borders ^= FrameSvg::BottomBorder;
|
borders ^= FrameSvg::BottomBorder;
|
||||||
|
leftWidth = 0;
|
||||||
|
rightWidth = 0;
|
||||||
|
bottomHeight = 0;
|
||||||
break;
|
break;
|
||||||
case TopEdge:
|
case TopEdge:
|
||||||
borders ^= FrameSvg::TopBorder;
|
borders ^= FrameSvg::TopBorder;
|
||||||
|
topHeight = 0;
|
||||||
|
leftWidth = 0;
|
||||||
|
rightWidth = 0;
|
||||||
break;
|
break;
|
||||||
case LeftEdge:
|
case LeftEdge:
|
||||||
borders ^= FrameSvg::LeftBorder;
|
borders ^= FrameSvg::LeftBorder;
|
||||||
|
leftWidth = 0;
|
||||||
|
rightWidth = 0;
|
||||||
break;
|
break;
|
||||||
case RightEdge:
|
case RightEdge:
|
||||||
borders ^= FrameSvg::RightBorder;
|
borders ^= FrameSvg::RightBorder;
|
||||||
|
leftWidth = 0;
|
||||||
|
rightWidth = 0;
|
||||||
break;
|
break;
|
||||||
default:
|
default:
|
||||||
break;
|
break;
|
||||||
@ -143,7 +153,10 @@ void DialogPrivate::themeUpdated()
|
|||||||
|
|
||||||
background->setEnabledBorders(borders);
|
background->setEnabledBorders(borders);
|
||||||
|
|
||||||
background->getMargins(leftWidth, topHeight, rightWidth, bottomHeight);
|
if (!extender) {
|
||||||
|
background->getMargins(leftWidth, topHeight, rightWidth, bottomHeight);
|
||||||
|
}
|
||||||
|
|
||||||
q->setContentsMargins(leftWidth, topHeight, rightWidth, bottomHeight);
|
q->setContentsMargins(leftWidth, topHeight, rightWidth, bottomHeight);
|
||||||
|
|
||||||
q->update();
|
q->update();
|
||||||
|
Loading…
x
Reference in New Issue
Block a user