# HG changeset patch # User Santeri Piippo # Date 1394406171 -7200 # Node ID 4ace632e247b05e3197d41b09e3ed714593268aa # Parent 3868f52da6b99eda0ca85a8b9d5400ea97212e3a - ported over the selected color blend from master diff -r 3868f52da6b9 -r 4ace632e247b src/GLCompiler.cc --- a/src/GLCompiler.cc Mon Mar 10 00:53:39 2014 +0200 +++ b/src/GLCompiler.cc Mon Mar 10 01:02:51 2014 +0200 @@ -9,6 +9,8 @@ #include "GLRenderer.h" #include "Dialogs.h" +cfg (String, gl_selectcolor, "#0080FF") + struct GLErrorInfo { GLenum value; @@ -165,12 +167,11 @@ if (topobj->isSelected()) { - // Brighten it up if selected. - const int add = 51; - - qcol.setRed (min (qcol.red() + add, 255)); - qcol.setGreen (min (qcol.green() + add, 255)); - qcol.setBlue (min (qcol.blue() + add, 255)); + // Brighten it up for the select list. + QColor selcolor (gl_selectcolor); + qcol.setRed ((qcol.red() + selcolor.red()) / 2); + qcol.setGreen ((qcol.green() + selcolor.green()) / 2); + qcol.setBlue ((qcol.blue() + selcolor.blue()) / 2); } return qcol; diff -r 3868f52da6b9 -r 4ace632e247b src/GLRenderer.cc --- a/src/GLRenderer.cc Mon Mar 10 00:53:39 2014 +0200 +++ b/src/GLRenderer.cc Mon Mar 10 01:02:51 2014 +0200 @@ -64,7 +64,6 @@ cfg (String, gl_bgcolor, "#FFFFFF") cfg (String, gl_maincolor, "#A0A0A0") cfg (Float, gl_maincolor_alpha, 1.0) -cfg (String, gl_selectcolor, "#0080FF") cfg (Int, gl_linethickness, 2) cfg (Bool, gl_colorbfc, false) cfg (Int, gl_camera, GLRenderer::EFreeCamera)