From: daid303 <daid303@gmail.com>
Date: Wed, 6 Mar 2013 15:29:21 +0000 (+0100)
Subject: Update the combo box text color to white.
X-Git-Tag: 13.03~23
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=commitdiff_plain;h=5c26ebf0c3f8a1a6ba6e744e24becb312e238941;p=cura.git

Update the combo box text color to white.
---

diff --git a/Cura/gui/util/openglGui.py b/Cura/gui/util/openglGui.py
index 5a2a92fe..25ae4225 100644
--- a/Cura/gui/util/openglGui.py
+++ b/Cura/gui/util/openglGui.py
@@ -372,7 +372,6 @@ class glButton(glGuiControl):
 		glTranslatef(pos[0], pos[1], 0)
 		glDisable(GL_TEXTURE_2D)
 		if self._focus:
-			glColor4ub(0,0,0,255)
 			glColor4ub(255,255,255,255)
 			glTranslatef(0, -0.55*bs*scale, 0)
 			opengl.glDrawStringCenter(self._tooltip)
@@ -451,12 +450,12 @@ class glComboButton(glButton):
 		glScalef(bs, bs, bs)
 		for n in xrange(0, len(self._imageIDs)):
 			glTranslatef(0, 1, 0)
-			glColor3ub(255,255,255)
+			glColor4ub(255,255,255,255)
 			opengl.glDrawTexturedQuad(-0.5,-0.5,1,1, self._imageIDs[n])
 			glDisable(GL_TEXTURE_2D)
 
 			glPushMatrix()
-			glColor4ub(0,0,0,255)
+			glColor4ub(255,255,255,255)
 			glTranslatef(-0.55, 0.1, 0)
 			opengl.glDrawStringRight(self._tooltips[n])
 			glPopMatrix()