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

Backport r911207. Add 4px padding between the title text and the

Browse source 
stripes so that it doesn't look so cramped.

svn path=/branches/KDE/4.2/kdebase/workspace/; revision=911212
This commit is contained in:
Lucas Murray 2009-01-15 02:15:10 +00:00
parent 6b4401e3ae
commit 0d8a186ce7
2 changed files with 8 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
clients/oxygen/oxygenclient.cpp
View file

@ -337,20 +337,20 @@ void OxygenClient::paintEvent(QPaintEvent *e)
}
if (align & Qt::AlignLeft) {
int left = titleLeft + QFontMetrics(options()->font(isActive(), false)).width(caption());
int left = titleLeft + QFontMetrics(options()->font(isActive(), false)).width(caption()) + 4;
int right = titleLeft + titleWidth;
drawScratch(&painter, palette, left, right, titleTop+6);
}
if (align & Qt::AlignRight) {
int left = titleLeft;
int right = titleLeft + titleWidth - QFontMetrics(options()->font(isActive(), false)).width(caption());
int right = titleLeft + titleWidth - QFontMetrics(options()->font(isActive(), false)).width(caption()) - 4;
drawScratch(&painter, palette, right, left, titleTop+6);
}
if (align & Qt::AlignHCenter) {
int textWidth = QFontMetrics(options()->font(isActive(), false)).width(caption());
int left = titleLeft;
int centerLeft = titleLeft + titleWidth/2 - textWidth/2;
int centerRight = titleLeft + titleWidth/2 + textWidth/2;
int centerLeft = titleLeft + titleWidth/2 - textWidth/2 - 4;
int centerRight = titleLeft + titleWidth/2 + textWidth/2 + 4;
int right = titleLeft + titleWidth;
drawScratch(&painter, palette, centerLeft, left, titleTop+6);
drawScratch(&painter, palette, centerRight, right, titleTop+6);

8
clients/ozone/oxygenclient.cpp
View file

@ -346,20 +346,20 @@ void OxygenClient::paintEvent(QPaintEvent *e)
}
if (align & Qt::AlignLeft) {
int left = titleLeft + QFontMetrics(options()->font(isActive(), false)).width(caption());
int left = titleLeft + QFontMetrics(options()->font(isActive(), false)).width(caption()) + 4;
int right = titleLeft + titleWidth;
drawScratch(&painter, palette, left, right, titleTop+6);
}
if (align & Qt::AlignRight) {
int left = titleLeft;
int right = titleLeft + titleWidth - QFontMetrics(options()->font(isActive(), false)).width(caption());
int right = titleLeft + titleWidth - QFontMetrics(options()->font(isActive(), false)).width(caption()) - 4;
drawScratch(&painter, palette, right, left, titleTop+6);
}
if (align & Qt::AlignHCenter) {
int textWidth = QFontMetrics(options()->font(isActive(), false)).width(caption());
int left = titleLeft;
int centerLeft = titleLeft + titleWidth/2 - textWidth/2;
int centerRight = titleLeft + titleWidth/2 + textWidth/2;
int centerLeft = titleLeft + titleWidth/2 - textWidth/2 - 4;
int centerRight = titleLeft + titleWidth/2 + textWidth/2 + 4;
int right = titleLeft + titleWidth;
drawScratch(&painter, palette, centerLeft, left, titleTop+6);
drawScratch(&painter, palette, centerRight, right, titleTop+6);