From: Steven Abadie Date: Tue, 21 Oct 2014 05:14:50 +0000 (-0600) Subject: Minimized button resizing and removed helper text in prep for new buttons. X-Git-Tag: 14.09-1.18~109 X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=commitdiff_plain;h=dffb58079ac624e865d16882d1c9f0446d8e3291;p=cura.git Minimized button resizing and removed helper text in prep for new buttons. --- diff --git a/Cura/gui/util/openglGui.py b/Cura/gui/util/openglGui.py index 37a27ead..a6731929 100644 --- a/Cura/gui/util/openglGui.py +++ b/Cura/gui/util/openglGui.py @@ -458,11 +458,12 @@ class glButton(glGuiControl): pos = self._getPixelPos() glBindTexture(GL_TEXTURE_2D, self._base._glButtonsTexture) + #button sizing scale = 0.8 if self._selected: - scale = 1.0 + scale = 0.85 elif self._focus: - scale = 0.9 + scale = 0.85 if self._disabled: glColor4ub(128,128,128,128) else: @@ -477,7 +478,7 @@ class glButton(glGuiControl): glPushMatrix() glTranslatef(pos[0], pos[1], 0) glDisable(GL_TEXTURE_2D) - if self._focus: + '''if self._focus: glTranslatef(0, -0.55*bs*scale, 0) glPushMatrix() @@ -494,6 +495,7 @@ class glButton(glGuiControl): glColor4ub(255,255,255,255) openglHelpers.glDrawStringCenter(self._tooltip) + ''' glPopMatrix() progress = self._progressBar if progress is not None: