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

use helper class to render resize handle dots, for consistency with the style.

Browse source 
svn path=/trunk/KDE/kdebase/workspace/; revision=1135179
This commit is contained in:
Hugo Pereira Da Costa 2010-06-06 18:12:21 +00:00
parent e8b9ef0702
commit 0ec3c6bf5a
1 changed files with 11 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

31
clients/oxygen/oxygenclient.cpp
View file

@ -47,12 +47,6 @@
namespace Oxygen namespace Oxygen
{ {
//___________________________________________
void renderDot(QPainter *p, const QPointF &point, qreal diameter)
{
p->drawEllipse(QRectF(point.x()-diameter/2, point.y()-diameter/2, diameter, diameter));
}
//_________________________________________________________ //_________________________________________________________
QColor reduceContrast(const QColor &c0, const QColor &c1, double t) QColor reduceContrast(const QColor &c0, const QColor &c1, double t)
{ {
@ -1120,14 +1114,14 @@ namespace Oxygen
{ {
// Draw right side 3-dots resize handles // Draw right side 3-dots resize handles
qreal cenY = h / 2 + y + 0.5; //qreal cenY = h / 2 + y + 0.5;
qreal posX = w + x - 2.5; //qreal posX = w + x - 2.5;
qreal cenY = h / 2 + y ;
qreal posX = w + x - 3;
painter->setPen(Qt::NoPen); helper().renderDot( painter, QPointF(posX, cenY - 3), color);
painter->setBrush( color ); helper().renderDot( painter, QPointF(posX, cenY), color);
renderDot( painter, QPointF(posX, cenY - 3), 1.8); helper().renderDot( painter, QPointF(posX, cenY + 3), color);
renderDot( painter, QPointF(posX, cenY), 1.8);
renderDot( painter, QPointF(posX, cenY + 3), 1.8);
} }
@ -1135,14 +1129,11 @@ namespace Oxygen
if( isResizable() && !isShade() && !configuration().drawSizeGrip() ) if( isResizable() && !isShade() && !configuration().drawSizeGrip() )
{ {
painter->setPen(Qt::NoPen);
painter->setBrush( color );
painter->save(); painter->save();
painter->translate(x + w-9, y + h-9); painter->translate(x + w-9, y + h-9);
renderDot( painter, QPointF(2.5, 6.5), 1.8); helper().renderDot( painter, QPointF(2, 6), color);
renderDot( painter, QPointF(5.5, 5.5), 1.8); helper().renderDot( painter, QPointF(5, 5), color);
renderDot( painter, QPointF(6.5, 2.5), 1.8); helper().renderDot( painter, QPointF(6, 2), color);
painter->restore(); painter->restore();
} }
@ -1437,7 +1428,7 @@ namespace Oxygen
renderFloatFrame( &painter, frame, palette ); renderFloatFrame( &painter, frame, palette );
// resize handles // resize handles
renderDots( &painter, frame, QColor(0, 0, 0, 66) ); renderDots( &painter, frame, backgroundColor( widget(), palette ) );
painter.restore(); painter.restore();
} }