Apply the proper edge color in the color sector too

Tue, 16 Jul 2013 20:01:36 +0300

author
Santeri Piippo <crimsondusk64@gmail.com>
date
Tue, 16 Jul 2013 20:01:36 +0300
changeset 397
a1d3d558d3fa
parent 396
582bea871af9
child 398
7f278b48079a

Apply the proper edge color in the color sector too

src/colorSelectDialog.cpp file | annotate | diff | comparison | revisions
--- a/src/colorSelectDialog.cpp	Tue Jul 16 19:38:47 2013 +0300
+++ b/src/colorSelectDialog.cpp	Tue Jul 16 20:01:36 2013 +0300
@@ -83,7 +83,6 @@
 	ui->viewport->setSceneRect (sceneRect);
 	
 	const double penWidth = 1.0f;
-	QPen pen (Qt::black, penWidth, Qt::SolidLine, Qt::FlatCap, Qt::MiterJoin);
 	
 	// Draw the color rectangles.
 	m_scene->clear();
@@ -106,9 +105,10 @@
 			col.setAlpha (gl_maincolor_alpha * 255.0f);
 		}
 		
+		QPen pen (info->edgeColor, penWidth, Qt::SolidLine, Qt::FlatCap, Qt::MiterJoin);
 		m_scene->addRect (x, y, w, w, pen, col);
 		QGraphicsTextItem* numtext = m_scene->addText (fmt ("%1", i));
-		numtext->setDefaultTextColor ( (luma (col) < 80) ? Qt::white : Qt::black);
+		numtext->setDefaultTextColor ((luma (col) < 80) ? Qt::white : Qt::black);
 		numtext->setPos (x, y);
 		
 		if (sel() && i == sel()->index) {

mercurial