# HG changeset patch # User Santeri Piippo # Date 1373994096 -10800 # Node ID a1d3d558d3faedb1bcf212298de0e36827deb4ac # Parent 582bea871af9f09cb46daf74e1f6b8ae3afc5fc9 Apply the proper edge color in the color sector too diff -r 582bea871af9 -r a1d3d558d3fa src/colorSelectDialog.cpp --- 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) {