Changeset 7889 in orxonox.OLD for branches/gui/src/lib

Timestamp:

May 27, 2006, 3:14:45 AM (19 years ago)

Author:

bensch

Message:

gui: fixed one of the holy bugs

Location:

branches/gui/src/lib

Files:

• graphics/text_engine/multi_line_text.cc (modified) (2 diffs)
• graphics/text_engine/text.cc (modified) (2 diffs)
• gui/gl_gui/glgui_pushbutton.cc (modified) (1 diff)

branches/gui/src/lib/graphics/text_engine/multi_line_text.cc

@@ -64 +64 @@
     return;
   glPushMatrix();
+  glPushAttrib(GL_ENABLE_BIT);
   // transform for alignment.
   // TODO make the Stuff with the alignment
@@ -117 +118 @@
   }
   glEnd();
+  glPopAttrib();
   glPopMatrix();
 }

branches/gui/src/lib/graphics/text_engine/text.cc

@@ -189 +189 @@
     return;
   glPushMatrix();
+  glPushAttrib(GL_ENABLE_BIT);
   // transform for alignment.
   if (this->getAlignment() == TEXT_ALIGN_RIGHT)
@@ -230 +231 @@
   }
   glEnd();
+  glPopAttrib();
   glPopMatrix();
 }

branches/gui/src/lib/gui/gl_gui/glgui_pushbutton.cc

@@ -92 +92 @@
     glBegin(GL_QUADS);
 
-    glVertex2d(1, 1);
-    glVertex2d(1, this->getSizeY2D() -1);
-    glVertex2d(this->getSizeX2D() -1, this->getSizeY2D()-1);
-    glVertex2d(this->getSizeX2D()-1,1);
+    glTexCoord2i(0,0); glVertex2d(1, 1);
+    glTexCoord2i(0,1); glVertex2d(1, this->getSizeY2D() - 1);
+    glTexCoord2i(1,1); glVertex2d(this->getSizeX2D() - 1, this->getSizeY2D() -1);
+    glTexCoord2i(1,0); glVertex2d(this->getSizeX2D() - 1, 1);
 
     glEnd();