diff options
author | Marius Kintel <marius@kintel.net> | 2011-12-28 16:10:25 (GMT) |
---|---|---|
committer | Marius Kintel <marius@kintel.net> | 2011-12-28 16:10:25 (GMT) |
commit | e14a9e2d28ad13e2a01864ecf7fb6a1ab9472b38 (patch) | |
tree | f8dca3085a23c25588aee56d3f3361bbad488f49 /src | |
parent | 00a0ec64197e69b0486b39747440ae8f7b2e74a7 (diff) | |
parent | bd2662a858eb74eb75307856cf89008e32a14782 (diff) |
Merge branch 'master' into color-priority
Diffstat (limited to 'src')
-rw-r--r-- | src/glview.cc | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/src/glview.cc b/src/glview.cc index f25cac6..141d998 100644 --- a/src/glview.cc +++ b/src/glview.cc @@ -500,10 +500,11 @@ void GLView::paintGL() // FIXME: This was an attempt to keep contrast with background, but is suboptimal // (e.g. nearly invisible against a gray background). - int r,g,b; - r=g=b=0; +// int r,g,b; +// r=g=b=0; // bgcol.getRgb(&r, &g, &b); - glColor3d((255.0-r)/255.0, (255.0-g)/255.0, (255.0-b)/255.0); +// glColor3f((255.0f-r)/255.0f, (255.0f-g)/255.0f, (255.0f-b)/255.0f); + glColor3f(0.0f, 0.0f, 0.0f); glBegin(GL_LINES); // X Label glVertex3d(xlabel_x-3, xlabel_y-3, 0); glVertex3d(xlabel_x+3, xlabel_y+3, 0); |