Changeset 8619 in orxonox.OLD for trunk/src/lib/gui/gl/glgui_image.cc

Timestamp:

Jun 20, 2006, 1:24:11 PM (19 years ago)

Author:

bensch

Message:

trunk: merged the gui-branche back.
merged with command:
svn merge -r8520:HEAD ​https://svn.orxonox.net/orxonox/branches/gui
no conflicts

File:

• trunk/src/lib/gui/gl/glgui_image.cc (modified) (2 diffs)

trunk/src/lib/gui/gl/glgui_image.cc

@@ -47 +47 @@
     this->setClassID(CL_GLGUI_IMAGE, "GLGuiImage");
 
+    this->setForegroundColor(Color(1,1,1,1));
     this->_imageMaterial.setBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
 
@@ -76 +77 @@
   void GLGuiImage::updateFrontColor()
   {
-    this->_imageMaterial.setDiffuseColor(this->frontColor());
+    this->_imageMaterial.setDiffuseColor(foregroundColor());
   }
 
   void GLGuiImage::resize()
   {
-    this->_imagePlane.setTopLeft(this->borderLeft(), this->borderTop());
+    this->_imagePlane.setTopLeft(borderLeft(), borderTop());
     this->_imagePlane.setSize(this->getSizeX2D() - (borderLeft() + borderRight()), this->getSizeY2D() - (borderTop() + borderBottom()) );
     GLGuiWidget::resize();