1 files changed, 6 insertions, 12 deletions

diff --git a/noncore/styles/liquid/liquiddeco.cpp b/noncore/styles/liquid/liquiddeco.cpp
index 8eee1b1..5488c67 100644
--- a/noncore/styles/liquid/liquiddeco.cpp
+++ b/noncore/styles/liquid/liquiddeco.cpp
@@ -53,123 +53,117 @@ public:
 
 LiquidDecoration::LiquidDecoration()
 		: QPEDecoration()
 {}
 
 LiquidDecoration::~LiquidDecoration()
 {}
 
 int LiquidDecoration::getTitleHeight( const QWidget * )
 {
 	return 15;
 }
 
 
 void LiquidDecoration::paint( QPainter *painter, const QWidget *widget )
 {
 	int titleWidth = getTitleWidth( widget );
 	int titleHeight = getTitleHeight( widget );
 
 	QRect rect( widget->rect() );
 
 	// Border rect
 	QRect br( rect.left() - BORDER_WIDTH,
 	          rect.top() - BORDER_WIDTH - titleHeight,
 	          rect.width() + 2 * BORDER_WIDTH,
 	          rect.height() + BORDER_WIDTH + BOTTOM_BORDER_WIDTH + titleHeight );
 
 	// title bar rect
 	QRect tr;
 
 	tr = QRect( rect.left(), rect.top() - titleHeight, rect.width(), titleHeight );
 
 	QRegion oldClip = painter->clipRegion();
 	painter->setClipRegion( oldClip - QRegion( tr ) );	// reduce flicker
 
 	bool isActive = ( widget == qApp->activeWindow() );
 
 	QColorGroup cg = QApplication::palette().active();
 	if ( isActive )
 		cg. setBrush ( QColorGroup::Button, cg. brush ( QColorGroup::Highlight ) );
 
 	qDrawWinPanel( painter, br.x(), br.y(), br.width(),
 	               br.height() - 4, cg, FALSE,
 	               &cg.brush( QColorGroup::Background ) );
 
 	painter->setClipRegion( oldClip );
 
 	if ( titleWidth > 0 ) {
-		QBrush titleBrush;
-		QPen titlePen;
-		QPen titleLines;
-		int titleLeft = titleHeight + 4;
-
-		titleLeft = rect.left() + 5;
 		painter->setPen( cg.midlight() );
 		painter->drawLine( rect.left() - BORDER_WIDTH + 2,
 		                   rect.bottom() + 1, rect.right() + BORDER_WIDTH - 2,
 		                   rect.bottom() + 1 );
 
 		QRect t ( rect.left() - 2, rect.top() - titleHeight - 2, rect.width() + 3, titleHeight + 2 );
 
 
 
 		QApplication::style().drawBevelButton( painter, t.x(), t.y(), t.width(), t.height(), cg, isActive );
 
-		t.setLeft( t.left() + 4 );
-		t.setRight( t.right() - 2 );
+		t .setLeft ( t. left ( ) + 4 );
+		t .setRight ( t. right ( ) - 2 );
 
-		QFont f( QApplication::font() );
-		f.setWeight( QFont::Bold );
+		QFont f ( QApplication::font ( ));
+		f. setWeight ( QFont::Bold );
 
-		painter-> setFont( f );
+		painter-> setFont ( f );
 
 		QColor textcol = cg.color( isActive ? QColorGroup::HighlightedText : QColorGroup::Text );
-		QColor shadecol = ( qGray ( textcol. rgb ( ) ) > 128 ) ? textcol. dark ( 130 ) : textcol.light( 200 );
+		QColor shadecol = ( qGray ( textcol. rgb ( ) ) > 128 ) ? textcol. dark ( 230 ) : textcol.light( 300 );
 
 		if ( textcol == shadecol ) {
 			if ( qGray ( shadecol. rgb ( ) ) < 128 )
 				shadecol = QColor ( 225, 225, 225 );
 			else
 				shadecol = QColor ( 30, 30, 30 );
 		}
 
 		painter-> setPen( shadecol );
 		painter-> drawText( t.x() + 1, t.y() + 1, t.width(), t.height(), Qt::AlignLeft | Qt::AlignVCenter | Qt::SingleLine, widget->caption() );
 		painter-> setPen( textcol );
 		painter-> drawText( t.x(), t.y(), t.width(), t.height(), Qt::AlignLeft | Qt::AlignVCenter | Qt::SingleLine, widget->caption() );
 	}
 
 #ifndef MINIMIZE_HELP_HACK
 	paintButton( painter, widget, ( QWSDecoration::Region ) Help, 0 );
 #endif
 }
 
 void LiquidDecoration::paintButton( QPainter *painter, const QWidget *w,
                                     QWSDecoration::Region type, int state )
 {
 	const QColorGroup & cg = w->palette().active();
 
 	QRect brect( region( w, w->rect(), type ).boundingRect() );
 
 	const QImage *img = 0;
 
 	switch ( ( int ) type ) {
 		case Close:
 			img = &imageClose;
 			break;
 		case Minimize:
 			if ( ( ( HackWidget * ) w ) ->needsOk() ||
 			        ( w->inherits( "QDialog" ) && !w->inherits( "QMessageBox" ) ) )
 				img = &imageOk;
 			else if ( helpExists )
 				img = &imageHelp;
 			break;
 		case Help:
 			img = &imageHelp;
 			break;
 		default:
 			return ;
 	}
 
 	if ( img ) {
 		if ( ( state & QWSButton::MouseOver ) && ( state & QWSButton::Clicked ) )