Made lines in typesetting controls antialiased.
Originally committed to SVN as r1311.
This commit is contained in:
parent
2f911574d6
commit
36df5b3de2
2 changed files with 4 additions and 6 deletions
|
@ -250,13 +250,10 @@ void OpenGLWrapper::SetFillColour(wxColour col,float alpha) {
|
||||||
// Line
|
// Line
|
||||||
void OpenGLWrapper::SetModeLine() {
|
void OpenGLWrapper::SetModeLine() {
|
||||||
glColor4f(r1,g1,b1,a1);
|
glColor4f(r1,g1,b1,a1);
|
||||||
if (a1 == 1.0f) glDisable(GL_BLEND);
|
glEnable(GL_BLEND);
|
||||||
else {
|
glBlendFunc(GL_SRC_ALPHA,GL_ONE_MINUS_SRC_ALPHA);
|
||||||
glEnable(GL_BLEND);
|
|
||||||
glBlendFunc(GL_SRC_ALPHA,GL_ONE_MINUS_SRC_ALPHA);
|
|
||||||
}
|
|
||||||
glLineWidth(lw);
|
glLineWidth(lw);
|
||||||
//glEnable(GL_LINE_SMOOTH);
|
glEnable(GL_LINE_SMOOTH);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
|
@ -468,6 +468,7 @@ void VideoDisplayVisual::DrawOverlay() {
|
||||||
// Current position info
|
// Current position info
|
||||||
if (mode == 0 && x >= 0 && x < w && y >= 0 && y < h) {
|
if (mode == 0 && x >= 0 && x < w && y >= 0 && y < h) {
|
||||||
// Draw cross
|
// Draw cross
|
||||||
|
glDisable(GL_LINE_SMOOTH);
|
||||||
glEnable(GL_COLOR_LOGIC_OP);
|
glEnable(GL_COLOR_LOGIC_OP);
|
||||||
glLogicOp(GL_INVERT);
|
glLogicOp(GL_INVERT);
|
||||||
glBegin(GL_LINES);
|
glBegin(GL_LINES);
|
||||||
|
|
Loading…
Reference in a new issue