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

TitleEdge in Aurorae becomes configurable in maximized state.

Browse source 
It defaults to the TitleEdge values, so themes have to set it explicitly if they want to have a better click area in maximzed state.

svn path=/trunk/KDE/kdebase/workspace/; revision=1043404
This commit is contained in:
Martin Gräßlin 2009-11-01 13:00:01 +00:00
parent 8fd12edfe0
commit 0d2f78b214
5 changed files with 31 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -570,13 +570,13 @@ int AuroraeClient::layoutMetric(LayoutMetric lm, bool respectWindowState,
return conf.paddingBottom();
case LM_TitleEdgeLeft:
return conf.titleEdgeLeft();
return maximized && respectWindowState ? conf.titleEdgeLeftMaximized() : conf.titleEdgeLeft();
case LM_TitleEdgeRight:
return conf.titleBorderRight();
return maximized && respectWindowState ? conf.titleEdgeRightMaximized() : conf.titleBorderRight();
case LM_TitleEdgeTop:
return conf.titleEdgeTop();
return maximized && respectWindowState ? conf.titleEdgeTopMaximized() : conf.titleEdgeTop();
case LM_TitleEdgeBottom:
return conf.titleEdgeBottom();
return maximized && respectWindowState ? conf.titleEdgeBottomMaximized() : conf.titleEdgeBottom();
case LM_ButtonMarginTop:
return conf.buttonMarginTop();

4
clients/aurorae/src/themeconfig.cpp
View file

@ -71,6 +71,10 @@ void ThemeConfig::load(KConfig *conf)
m_titleEdgeBottom = border.readEntry("TitleEdgeBottom", 5);
m_titleEdgeLeft = border.readEntry("TitleEdgeLeft", 5);
m_titleEdgeRight = border.readEntry("TitleEdgeRight", 5);
m_titleEdgeTopMaximized = border.readEntry("TitleEdgeTopMaximized", m_titleEdgeTop);
m_titleEdgeBottomMaximized = border.readEntry("TitleEdgeBottomMaximized", m_titleEdgeBottom);
m_titleEdgeLeftMaximized = border.readEntry("TitleEdgeLeftMaximized", m_titleEdgeLeft);
m_titleEdgeRightMaximized = border.readEntry("TitleEdgeRightMaximized", m_titleEdgeRight);
m_titleBorderLeft = border.readEntry("TitleBorderLeft", 5);
m_titleBorderRight = border.readEntry("TitleBorderRight", 5);
m_titleHeight = border.readEntry("TitleHeight", 20);

16
clients/aurorae/src/themeconfig.h
View file

@ -88,6 +88,18 @@ public:
int titleEdgeRight() const {
return m_titleEdgeRight;
}
int titleEdgeTopMaximized() const {
return m_titleEdgeTopMaximized;
}
int titleEdgeBottomMaximized() const {
return m_titleEdgeBottomMaximized;
}
int titleEdgeLeftMaximized() const {
return m_titleEdgeLeftMaximized;
}
int titleEdgeRightMaximized() const {
return m_titleEdgeRightMaximized;
}
int titleBorderLeft() const {
return m_titleBorderLeft;
}
@ -184,6 +196,10 @@ private:
int m_titleEdgeBottom;
int m_titleEdgeLeft;
int m_titleEdgeRight;
int m_titleEdgeTopMaximized;
int m_titleEdgeBottomMaximized;
int m_titleEdgeLeftMaximized;
int m_titleEdgeRightMaximized;
int m_titleBorderLeft;
int m_titleBorderRight;
int m_titleHeight;

4
clients/aurorae/theme-description
View file

@ -106,6 +106,10 @@ TitleEdgeTop=5
TitleEdgeBottom=5
TitleEdgeLeft=5
TitleEdgeRight=5
TitleEdgeTopMaximized=? # optional - default depends on TitleEdgeTop
TitleEdgeBottomMaximized=? # optional - default depends on TitleEdgeBottom
TitleEdgeLeftMaximized=? # optional - default depends on TitleEdgeLeft
TitleEdgeRightMaximized=? # optional - default depends on TitleEdgeRight
TitleBorderLeft=5
TitleBorderRight=5
TitleHeight=20

3
clients/aurorae/themes/example-deco/example-decorc
View file

@ -18,6 +18,9 @@ TitleEdgeTop=5
TitleEdgeBottom=5
TitleEdgeLeft=5
TitleEdgeRight=5
TitleEdgeTopMaximized=0
TitleEdgeLeftMaximized=0
TitleEdgeRightMaximized=0
TitleBorderLeft=5
TitleBorderRight=5
TitleHeight=20