Browse Source

Reset OpenGL color before drawing images (fixes invisible content)

Signed-off-by: falkTX <falktx@falktx.com>
pull/297/head
falkTX 3 years ago
parent
commit
a1dd4b0aa7
Signed by: falkTX <falktx@falktx.com> GPG Key ID: CDBAA37ABC74FBA0
2 changed files with 5 additions and 3 deletions
  1. +2
    -0
      dgl/src/OpenGL.cpp
  2. +3
    -3
      tests/Demo.cpp

+ 2
- 0
dgl/src/OpenGL.cpp View File

@@ -316,6 +316,8 @@ static void drawOpenGLImage(const OpenGLImage& image, const Point<int>& pos, con
setupCalled = true; setupCalled = true;
} }


glColor4f(1.0f, 1.0f, 1.0f, 1.0f);

glEnable(GL_TEXTURE_2D); glEnable(GL_TEXTURE_2D);
glBindTexture(GL_TEXTURE_2D, textureId); glBindTexture(GL_TEXTURE_2D, textureId);




+ 3
- 3
tests/Demo.cpp View File

@@ -413,8 +413,8 @@ public:
wColor->setAbsoluteX(kSidebarWidth); wColor->setAbsoluteX(kSidebarWidth);


wImages = new ExampleImagesSubWidget(this); wImages = new ExampleImagesSubWidget(this);
wImages->hide()
wImages->setAbsoluteX(kSidebarWidth);;
wImages->hide();
wImages->setAbsoluteX(kSidebarWidth);


wRects = new ExampleRectanglesSubWidget(this); wRects = new ExampleRectanglesSubWidget(this);
wRects->hide(); wRects->hide();
@@ -432,7 +432,7 @@ public:
wLeft = new LeftSideWidget(this, this), wLeft = new LeftSideWidget(this, this),
wLeft->setAbsolutePos(2, 2); wLeft->setAbsolutePos(2, 2);


resizer = new ResizeHandle(this),
resizer = new ResizeHandle(this);


curPageChanged(0); curPageChanged(0);
} }


Loading…
Cancel
Save