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

Three changes; fix two bugs, migrate plastik.cpp to KColorUtils/KColorScheme way of handling colors (and away from misc.cpp)

Browse source 
bug - add +2 to titleBarTileHeight in PlastikHandler::pixmap, this fixes the pixmap not being tall enough (it seems between 3.5 and 4.0 the titlebar is being drawn two pixels taller; this fixes the symptom, not the cause, which I didn't find)

bug - porting error on my part had an extra stop in the titlebar gradient, changing the appearance; remove the extra stop

TODO: find and correct the real cause?
TODO: port other code away from misc.cpp and then kill misc.cpp

svn path=/trunk/KDE/kdebase/workspace/; revision=745163
This commit is contained in:
Matthew Woehlke 2007-12-05 16:05:04 +00:00
parent 78bbe3d833
commit e21a0778fd
1 changed files with 21 additions and 31 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

52
clients/plastik/plastik.cpp
View file

@ -23,8 +23,6 @@
#include <QBitmap> #include <QBitmap>
#include <QPainter> #include <QPainter>
#include <QImage> #include <QImage>
#include <kconfiggroup.h>
#include <QPixmap> #include <QPixmap>
#include "misc.h" #include "misc.h"
@ -33,7 +31,11 @@
#include "plastikclient.h" #include "plastikclient.h"
#include "plastikbutton.h" #include "plastikbutton.h"
#include <QApplication> #include <QApplication>
#include <kconfig.h> #include <KConfig>
#include <KConfigGroup>
#include <KColorUtils>
#include <KColorScheme>
#include <KGlobalSettings>
namespace KWinPlastik namespace KWinPlastik
{ {
@ -201,25 +203,24 @@ void PlastikHandler::readConfig()
QColor PlastikHandler::getColor(KWinPlastik::ColorType type, const bool active) QColor PlastikHandler::getColor(KWinPlastik::ColorType type, const bool active)
{ {
double c = KGlobalSettings::contrastF();
switch (type) { switch (type) {
case WindowContour: case WindowContour:
return KDecoration::options()->color(ColorTitleBar, active).dark(200); return KColorScheme::shade(KDecoration::options()->color(ColorTitleBar, active), KColorScheme::DarkShade, c);
case TitleGradient1: case TitleGradient1:
return hsvRelative(KDecoration::options()->color(ColorTitleBar, active), 0,-10,+10); return KColorScheme::shade(KDecoration::options()->color(ColorTitleBar, active), KColorScheme::MidlightShade, c-0.4);
break; break;
case TitleGradient2: case TitleGradient2:
return hsvRelative(KDecoration::options()->color(ColorTitleBar, active), 0,0,-25); return KColorScheme::shade(KDecoration::options()->color(ColorTitleBar, active), KColorScheme::MidShade, c-0.4);
break; break;
case TitleGradient3: case TitleGradient3:
return KDecoration::options()->color(ColorTitleBar, active); return KDecoration::options()->color(ColorTitleBar, active);
break; break;
case ShadeTitleLight: case ShadeTitleLight:
return alphaBlendColors(KDecoration::options()->color(ColorTitleBar, active), return KColorScheme::shade(KDecoration::options()->color(ColorTitleBar, active), KColorScheme::LightShade, active?c-0.4:c-0.8);
Qt::white, active?205:215);
break; break;
case ShadeTitleDark: case ShadeTitleDark:
return alphaBlendColors(KDecoration::options()->color(ColorTitleBar, active), return KColorScheme::shade(KDecoration::options()->color(ColorTitleBar, active), KColorScheme::DarkShade, active?c-0.4:c-0.8);
Qt::black, active?205:215);
break; break;
case Border: case Border:
return KDecoration::options()->color(ColorFrame, active); return KDecoration::options()->color(ColorFrame, active);
@ -241,7 +242,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); const int titleBarTileHeight = (toolWindow ? m_titleHeightTool : m_titleHeight)+2;
// 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);
@ -250,7 +251,6 @@ const QPixmap &PlastikHandler::pixmap(Pixmaps type, bool active, bool toolWindow
QLinearGradient grad(0, 0, 0, gradientHeight); QLinearGradient grad(0, 0, 0, gradientHeight);
grad.setColorAt(0.0, getColor(TitleGradient1, active)); grad.setColorAt(0.0, getColor(TitleGradient1, active));
grad.setColorAt(4.0 / (double)gradientHeight, getColor(TitleGradient2, active)); grad.setColorAt(4.0 / (double)gradientHeight, getColor(TitleGradient2, active));
grad.setColorAt(1.0 - (4.0 / (double)gradientHeight), getColor(TitleGradient2, active));
grad.setColorAt(1.0, getColor(TitleGradient3, active)); grad.setColorAt(1.0, getColor(TitleGradient3, active));
painter.setBrush(grad); painter.setBrush(grad);
painter.drawRect(0, 0, 1, gradientHeight); painter.drawRect(0, 0, 1, gradientHeight);
@ -274,7 +274,7 @@ const QPixmap &PlastikHandler::pixmap(Pixmaps type, bool active, bool toolWindow
painter.begin(pm); painter.begin(pm);
painter.drawPixmap(0, 0, gradient, 0,2 ,-1,-1); painter.drawPixmap(0, 0, gradient, 0,2 ,-1,-1);
if (m_coloredBorder) { if (m_coloredBorder) {
painter.setPen(getColor(TitleGradient3, active).dark(110) ); painter.setPen(KColorScheme::shade(getColor(TitleGradient3, active), KColorScheme::MidShade) );
} else { } else {
painter.setPen(getColor(TitleGradient3, active) ); painter.setPen(getColor(TitleGradient3, active) );
} }
@ -364,14 +364,12 @@ const QPixmap &PlastikHandler::pixmap(Pixmaps type, bool active, bool toolWindow
painter.setPen(getColor(TitleGradient3, active) ); painter.setPen(getColor(TitleGradient3, active) );
painter.drawLine(2,0, w-2,0); painter.drawLine(2,0, w-2,0);
} }
painter.setPen(getColor(TitleGradient3, active).dark(110) ); painter.setPen(KColorScheme::shade(getColor(TitleGradient3, active), KColorScheme::MidShade) );
painter.drawPoint(w-1,0); painter.drawPoint(w-1,0);
} else { } else {
painter.setPen(getColor(WindowContour, active) ); painter.setPen(getColor(WindowContour, active) );
painter.drawPoint(0, 0); painter.drawPoint(0, 0);
painter.setPen( painter.setPen(KColorUtils::mix(getColor(Border, active), getColor(ShadeTitleLight, active) ) );
alphaBlendColors(getColor(Border, active),
getColor(ShadeTitleLight, active), 130) );
painter.drawPoint(1, 0); painter.drawPoint(1, 0);
painter.setPen(getColor(Border, active) ); painter.setPen(getColor(Border, active) );
painter.drawLine(2,0, w-1,0); painter.drawLine(2,0, w-1,0);
@ -389,7 +387,7 @@ const QPixmap &PlastikHandler::pixmap(Pixmaps type, bool active, bool toolWindow
pm = new QPixmap(w, 1); pm = new QPixmap(w, 1);
QPainter painter(pm); QPainter painter(pm);
if (m_coloredBorder) { if (m_coloredBorder) {
painter.setPen(getColor(TitleGradient3, active).dark(110) ); painter.setPen(KColorScheme::shade(getColor(TitleGradient3, active), KColorScheme::MidShade) );
painter.drawPoint(0,0); painter.drawPoint(0,0);
if (w > 3) { if (w > 3) {
painter.setPen(getColor(TitleGradient3, active) ); painter.setPen(getColor(TitleGradient3, active) );
@ -402,9 +400,7 @@ const QPixmap &PlastikHandler::pixmap(Pixmaps type, bool active, bool toolWindow
} else { } else {
painter.setPen(getColor(Border, active) ); painter.setPen(getColor(Border, active) );
painter.drawLine(0,0, w-3,0); painter.drawLine(0,0, w-3,0);
painter.setPen( painter.setPen(KColorUtils::mix(getColor(Border, active), getColor(ShadeTitleDark, active) ) );
alphaBlendColors(getColor(Border, active),
getColor(ShadeTitleDark, active), 130) );
painter.drawPoint(w-2, 0); painter.drawPoint(w-2, 0);
painter.setPen(getColor(WindowContour, active) ); painter.setPen(getColor(WindowContour, active) );
painter.drawPoint(w-1, 0); painter.drawPoint(w-1, 0);
@ -433,9 +429,7 @@ const QPixmap &PlastikHandler::pixmap(Pixmaps type, bool active, bool toolWindow
painter.setPen(getColor(TitleGradient3, active) ); painter.setPen(getColor(TitleGradient3, active) );
painter.drawLine(2,0, w-1,0); painter.drawLine(2,0, w-1,0);
} else { } else {
painter.setPen( painter.setPen(KColorUtils::mix(getColor(Border, active), getColor(ShadeTitleLight, active) ) );
alphaBlendColors(getColor(Border, active),
getColor(ShadeTitleLight, active), 130) );
painter.drawLine(1,0, 1,h-2); painter.drawLine(1,0, 1,h-2);
} }
@ -461,9 +455,7 @@ const QPixmap &PlastikHandler::pixmap(Pixmaps type, bool active, bool toolWindow
painter.setPen(getColor(TitleGradient3, active) ); painter.setPen(getColor(TitleGradient3, active) );
painter.drawLine(0,0, w-3,0); painter.drawLine(0,0, w-3,0);
} else { } else {
painter.setPen( painter.setPen(KColorUtils::mix(getColor(Border, active), getColor(ShadeTitleDark, active) ) );
alphaBlendColors(getColor(Border, active),
getColor(ShadeTitleDark, active), 130) );
painter.drawLine(w-2,0, w-2,h-2); painter.drawLine(w-2,0, w-2,h-2);
} }
@ -481,7 +473,7 @@ const QPixmap &PlastikHandler::pixmap(Pixmaps type, bool active, bool toolWindow
QPainter painter(pm); QPainter painter(pm);
if (m_coloredBorder) { if (m_coloredBorder) {
painter.setPen(getColor(TitleGradient3, active).dark(110) ); painter.setPen(KColorScheme::shade(getColor(TitleGradient3, active), KColorScheme::MidShade) );
painter.drawPoint(0,0); painter.drawPoint(0,0);
painter.setPen(getColor(TitleGradient3, active) ); painter.setPen(getColor(TitleGradient3, active) );
painter.drawLine(0,1, 0,h-3); painter.drawLine(0,1, 0,h-3);
@ -490,9 +482,7 @@ const QPixmap &PlastikHandler::pixmap(Pixmaps type, bool active, bool toolWindow
} else { } else {
painter.setPen(getColor(Border, active) ); painter.setPen(getColor(Border, active) );
painter.drawLine(0,0, 0,h-3); painter.drawLine(0,0, 0,h-3);
painter.setPen( painter.setPen(KColorUtils::mix(getColor(Border, active), getColor(ShadeTitleDark, active) ) );
alphaBlendColors(getColor(Border, active),
getColor(ShadeTitleDark, active), 130) );
painter.drawPoint(0, h-2); painter.drawPoint(0, h-2);
} }
painter.setPen(getColor(WindowContour, active) ); painter.setPen(getColor(WindowContour, active) );