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

Aurorae supports border sizes.

Browse source 
svn path=/trunk/KDE/kdebase/workspace/; revision=1046472
This commit is contained in:
Martin Gräßlin 2009-11-08 20:35:34 +00:00
parent 71a73acae8
commit 88c7f69708
2 changed files with 45 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

47
clients/aurorae/src/aurorae.cpp
View file

@ -172,6 +172,13 @@ Plasma::FrameSvg *AuroraeFactory::button(const QString &b)
}
}
QList< KDecorationDefines::BorderSize > AuroraeFactory::borderSizes() const
{
return QList< BorderSize >() << BorderTiny << BorderNormal <<
BorderLarge << BorderVeryLarge << BorderHuge <<
BorderVeryHuge << BorderOversized;
}
AuroraeFactory *AuroraeFactory::s_instance = NULL;
@ -552,13 +559,47 @@ int AuroraeClient::layoutMetric(LayoutMetric lm, bool respectWindowState,
bool maximized = maximizeMode() == MaximizeFull &&
!options()->moveResizeMaximizedWindows();
const ThemeConfig &conf = AuroraeFactory::instance()->themeConfig();
qreal left, top, right, bottom;
AuroraeFactory::instance()->frame()->getMargins(left, top, right, bottom);
int borderLeft, borderRight, borderBottom;;
switch (KDecoration::options()->preferredBorderSize(AuroraeFactory::instance())) {
case BorderTiny:
if (compositingActive()) {
borderLeft = qMin(0, (int)left - conf.borderLeft() - conf.paddingLeft());
borderRight = qMin(0, (int)right - conf.borderRight() - conf.paddingRight());
borderBottom = qMin(0, (int)bottom - conf.borderBottom() - conf.paddingBottom());
} else {
borderLeft = qMin(0, (int)left - conf.borderLeft());
borderRight = qMin(0, (int)right - conf.borderRight());
borderBottom = qMin(0, (int)bottom - conf.borderBottom());
}
break;
case BorderLarge:
borderLeft = borderRight = borderBottom = 4;
break;
case BorderVeryLarge:
borderLeft = borderRight = borderBottom = 8;
break;
case BorderHuge:
borderLeft = borderRight = borderBottom = 12;
break;
case BorderVeryHuge:
borderLeft = borderRight = borderBottom = 23;
break;
case BorderOversized:
borderLeft = borderRight = borderBottom = 36;
break;
case BorderNormal:
default:
borderLeft = borderRight = borderBottom = 0;
}
switch (lm) {
case LM_BorderLeft:
return maximized && respectWindowState ? 0 : conf.borderLeft();
return maximized && respectWindowState ? 0 : conf.borderLeft() + borderLeft;
case LM_BorderRight:
return maximized && respectWindowState ? 0 : conf.borderRight();
return maximized && respectWindowState ? 0 : conf.borderRight() + borderRight;
case LM_BorderBottom:
return maximized && respectWindowState ? 0 : conf.borderBottom();
return maximized && respectWindowState ? 0 : conf.borderBottom() + borderBottom;
case LM_OuterPaddingLeft:
return conf.paddingLeft();

1
clients/aurorae/src/aurorae.h
View file

@ -38,6 +38,7 @@ public:
bool reset(unsigned long changed);
KDecoration *createDecoration(KDecorationBridge*);
bool supports(Ability ability) const;
virtual QList< BorderSize > borderSizes() const;
Plasma::FrameSvg *frame() {
return &m_frame;