vitalif
/
kwin
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

- Fix the titlebar height for the rest of the shipped decorations. 

- Fix the "sticky" button rendering in the quartz decoration.

svn path=/trunk/KDE/kdebase/workspace/; revision=740254
icc-effect-5.14.5
Luciano Montanaro 2007-11-22 21:18:09 +00:00
parent a951008c1e
commit 97d274b7c3
5 changed files with 16 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
clients/modernsystem/modernsys.cpp
View File

@ -329,7 +329,7 @@ void ModernSysFactory::read_config()
bwidth = 4; bwidth = 4;
} }
theight = QFontMetrics(options()->font(true)).height() + 2; theight = QFontMetrics(options()->font(true)).height();
if (theight < 16) if (theight < 16)
theight = 16; theight = 16;
if (theight < bwidth) if (theight < bwidth)

2
clients/plastik/plastik.cpp
View File

@ -234,7 +234,7 @@ const QPixmap &PlastikHandler::pixmap(Pixmaps type, bool active, bool toolWindow
case TitleBarTileTop: case TitleBarTileTop:
case TitleBarTile: case TitleBarTile:
{ {
const int titleBarTileHeight = (toolWindow ? m_titleHeightTool : m_titleHeight) + 2; const int titleBarTileHeight = (toolWindow ? m_titleHeightTool : m_titleHeight);
// gradient used as well in TitleBarTileTop as TitleBarTile // gradient used as well in TitleBarTileTop as TitleBarTile
const int gradientHeight = 2 + titleBarTileHeight-1; const int gradientHeight = 2 + titleBarTileHeight-1;
QPixmap gradient(1, gradientHeight); QPixmap gradient(1, gradientHeight);

2
clients/plastik/plastikclient.cpp
View File

@ -482,7 +482,7 @@ const QPixmap &PlastikClient::captionPixmap() const
Handler()->pixmap(TitleBarTile, active, isToolWindow()) ); Handler()->pixmap(TitleBarTile, active, isToolWindow()) );
painter.setFont(s_titleFont); painter.setFont(s_titleFont);
QPoint tp(1, captionHeight-1); QPoint tp(1, captionHeight - 3);
if(Handler()->titleShadow()) if(Handler()->titleShadow())
{ {
QColor shadowColor; QColor shadowColor;

22
clients/quartz/quartz.cpp
View File

@ -247,13 +247,13 @@ void QuartzHandler::readConfig()
borderWidth = extraSlim?2:4; borderWidth = extraSlim?2:4;
} }
normalTitleHeight = QFontMetrics(options()->font(true)).height(); normalTitleHeight = QFontMetrics(options()->font(true)).height() - 2;
int nTH_limit=extraSlim?14:18; int nTH_limit=extraSlim?14:18;
normalTitleHeight = QFontMetrics(options()->font(true)).height()-(extraSlim?1:0); normalTitleHeight = QFontMetrics(options()->font(true)).height()-(extraSlim?1:0);
if (normalTitleHeight < nTH_limit) normalTitleHeight = nTH_limit; if (normalTitleHeight < nTH_limit) normalTitleHeight = nTH_limit;
if (normalTitleHeight < borderWidth) normalTitleHeight = borderWidth; if (normalTitleHeight < borderWidth) normalTitleHeight = borderWidth;
toolTitleHeight = QFontMetrics(options()->font(true, true)).height(); toolTitleHeight = QFontMetrics(options()->font(true, true)).height() - 2;
if (toolTitleHeight < 12) toolTitleHeight = 12; if (toolTitleHeight < 12) toolTitleHeight = 12;
if (toolTitleHeight < borderWidth) toolTitleHeight = borderWidth; if (toolTitleHeight < borderWidth) toolTitleHeight = borderWidth;
} }
@ -342,18 +342,18 @@ void QuartzHandler::createPixmaps()
g2 = options()->palette( ColorButtonBg, true ); g2 = options()->palette( ColorButtonBg, true );
g2.setCurrentColorGroup( QPalette::Active ); g2.setCurrentColorGroup( QPalette::Active );
pinUpPix = new QPixmap(16, 16); QImage pinImg = QImage(16, 16, QImage::Format_ARGB32_Premultiplied);
p.begin( pinUpPix ); p.begin(&pinImg);
p.fillRect( 0, 0, 16, 16, c); p.fillRect( 0, 0, 16, 16, c);
drawColorBitmaps( &p, g2, 0, 1, 16, 16, pinup_white_bits, pinup_gray_bits, pinup_dgray_bits ); drawColorBitmaps( &p, g2, 0, 1, 16, 16, pinup_white_bits, pinup_gray_bits, pinup_dgray_bits );
p.end(); p.end();
pinUpPix = new QPixmap(QPixmap::fromImage(pinImg));
pinDownPix = new QPixmap(16, 16); p.begin(&pinImg);
p.begin( pinDownPix );
p.fillRect( 0, 0, 16, 16, c); p.fillRect( 0, 0, 16, 16, c);
drawColorBitmaps( &p, g2, 0, 1, 16, 16, pindown_white_bits, pindown_gray_bits, pindown_dgray_bits ); drawColorBitmaps( &p, g2, 0, 1, 16, 16, pindown_white_bits, pindown_gray_bits, pindown_dgray_bits );
p.end(); p.end();
pinDownPix = new QPixmap(QPixmap::fromImage(pinImg));
// Inactive pins // Inactive pins
g = options()->palette( onAllDesktopsButtonOnLeft ? ColorTitleBar : ColorTitleBlend, false ); g = options()->palette( onAllDesktopsButtonOnLeft ? ColorTitleBar : ColorTitleBlend, false );
@ -362,17 +362,17 @@ void QuartzHandler::createPixmaps()
g2 = options()->palette( ColorButtonBg, false ); g2 = options()->palette( ColorButtonBg, false );
g2.setCurrentColorGroup( QPalette::Active ); g2.setCurrentColorGroup( QPalette::Active );
ipinUpPix = new QPixmap(16, 16); p.begin(&pinImg);
p.begin( ipinUpPix );
p.fillRect( 0, 0, 16, 16, c); p.fillRect( 0, 0, 16, 16, c);
drawColorBitmaps( &p, g2, 0, 1, 16, 16, pinup_white_bits, pinup_gray_bits, pinup_dgray_bits ); drawColorBitmaps( &p, g2, 0, 1, 16, 16, pinup_white_bits, pinup_gray_bits, pinup_dgray_bits );
p.end(); p.end();
ipinUpPix = new QPixmap(QPixmap::fromImage(pinImg));
ipinDownPix = new QPixmap(16, 16); p.begin(&pinImg);
p.begin( ipinDownPix );
p.fillRect( 0, 0, 16, 16, c); p.fillRect( 0, 0, 16, 16, c);
drawColorBitmaps( &p, g2, 0, 1, 16, 16, pindown_white_bits, pindown_gray_bits, pindown_dgray_bits ); drawColorBitmaps( &p, g2, 0, 1, 16, 16, pindown_white_bits, pindown_gray_bits, pindown_dgray_bits );
p.end(); p.end();
ipinDownPix = new QPixmap(QPixmap::fromImage(pinImg));
} }

4
clients/redmond/redmond.cpp
View File

@ -462,9 +462,9 @@ void RedmondDeco::init()
{ {
// Finally, toolwindows look small // Finally, toolwindows look small
if ( isToolWindow() ) { if ( isToolWindow() ) {
titleHeight = toolTitleHeight+2; titleHeight = toolTitleHeight;
} else { } else {
titleHeight = normalTitleHeight+2; titleHeight = normalTitleHeight;
} }
KCommonDecoration::init(); KCommonDecoration::init();