darker brush sliders

mozillamonks · Oct 11, 2008 · 1187400 · 1187400
1 parent f3484da
commit 1187400
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 4 deletions.
diff --git a/src/client/brushslider.cpp b/src/client/brushslider.cpp
@@ -52,7 +52,7 @@ void BrushSlider::paintEvent(QPaintEvent *event)
 
 	// Draw the background
 	painter.fillPath(path, palette().base());
-	painter.setPen(QPen(palette().color(QPalette::Mid)));
+	painter.setPen(QPen(palette().color(QPalette::Dark)));
 	painter.drawPath(path);
 
 	// Draw the brush circles
@@ -67,6 +67,7 @@ void BrushSlider::paintEvent(QPaintEvent *event)
 	fnt.setPixelSize(qRound(dia*0.7));
 	painter.setFont(fnt);
 
+	painter.setPen(QPen(palette().color(QPalette::ButtonText)));
 	if(pos > 0.5) {
 		painter.drawText(QRectF(dia+dia/2, 1, w, dia),
 				Qt::AlignLeft|Qt::AlignVCenter,
@@ -86,7 +87,7 @@ void BrushSlider::drawCircle(QPainter& painter, qreal dia, qreal x,
 	switch(style_) {
 		case Size: {
 			painter.setBrush(palette().base());
-			painter.setPen(QPen(palette().color(QPalette::Mid)));
+			painter.setPen(QPen(palette().color(QPalette::ButtonText)));
 			painter.drawEllipse(rect);
 			const qreal adj = (dia - dia*value)/2.0;
 			const QRectF r2 = rect.adjusted(adj,adj,-adj,-adj);
@@ -114,7 +115,7 @@ void BrushSlider::drawCircle(QPainter& painter, qreal dia, qreal x,
 			}
 			break;
 		case Spacing: {
-			painter.setPen(QPen(palette().color(QPalette::Mid)));
+			painter.setPen(QPen(palette().color(QPalette::ButtonText)));
 			qreal adj = dia/4.0;
 			qreal off = adj/1.0;
 			painter.drawEllipse(rect.adjusted(
@@ -125,7 +126,7 @@ void BrushSlider::drawCircle(QPainter& painter, qreal dia, qreal x,
 					  } return; // this is a special case
 
 	}
-	painter.setPen(QPen(palette().color(QPalette::Mid)));
+	painter.setPen(QPen(palette().color(QPalette::ButtonText)));
 	painter.drawEllipse(rect);
 }
 

diff --git a/src/client/toolsettings.cpp b/src/client/toolsettings.cpp
@@ -367,7 +367,9 @@ QWidget *SimpleSettings::createUi(QWidget *parent)
 		// If subpixel accuracy wasn't enabled, don't offer a chance to
 		// enable it.
 		ui_->hardedge->hide();
+#if (QT_VERSION >= QT_VERSION_CHECK(4, 4,0)) // Not supported by QT<4.4?
 		ui_->brushopts->addSpacing(ui_->hardedge->width());
+#endif
 	}
 
 	// Connect size change signal