[aedGUI-cvs] aedGUI/src aedFont.cpp,1.20,1.21 aedTextBox.cpp,1.39,1.40

[Rodrigo H. <kw...@us...>]

Update of /cvsroot/aedgui/aedGUI/src
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv15526/src

Modified Files:
	aedFont.cpp aedTextBox.cpp 
Log Message:
Fixed alpha blending for button labels, broke it for textboxes

Index: aedTextBox.cpp
===================================================================
RCS file: /cvsroot/aedgui/aedGUI/src/aedTextBox.cpp,v
retrieving revision 1.39
retrieving revision 1.40
diff -C2 -d -r1.39 -r1.40
*** aedTextBox.cpp	30 May 2004 03:51:19 -0000	1.39
--- aedTextBox.cpp	30 May 2004 21:50:56 -0000	1.40
***************
*** 434,438 ****
         if((width>m_Surface->w)||(m_Justification == AED_JUST_RIGHT))
  	 {
! 	   dest.x= m_Surface->w-width;
  	 }
  	Uint32 index = m_Font->getIndexToFirstChar(m_Surface,
--- 434,438 ----
         if((width>m_Surface->w)||(m_Justification == AED_JUST_RIGHT))
  	 {
! 	   dest.x= m_Surface->w-width-cPad;
  	 }
  	Uint32 index = m_Font->getIndexToFirstChar(m_Surface,

Index: aedFont.cpp
===================================================================
RCS file: /cvsroot/aedgui/aedGUI/src/aedFont.cpp,v
retrieving revision 1.20
retrieving revision 1.21
diff -C2 -d -r1.20 -r1.21
*** aedFont.cpp	29 May 2004 18:11:20 -0000	1.20
--- aedFont.cpp	30 May 2004 21:50:56 -0000	1.21
***************
*** 350,354 ****
  aedFont::generateFontVector()
  {
!     Uint16 ch;
      // these Colors are not randomly selected
      // in OpenGL these will help us get proper
--- 350,355 ----
  aedFont::generateFontVector()
  {
!     char ch[2];
!     ch[1]=0;
      // these Colors are not randomly selected
      // in OpenGL these will help us get proper
***************
*** 365,371 ****
      for(int i=0;i<charcount;++i)
        {
! 	ch = i+charoffset;
  	TTF_GlyphMetrics(data,
! 			 ch,
  			 &minx,
  			 &maxx,
--- 366,372 ----
      for(int i=0;i<charcount;++i)
        {
! 	ch[0] = i+charoffset;
  	TTF_GlyphMetrics(data,
! 			 ch[0],
  			 &minx,
  			 &maxx,
***************
*** 374,381 ****
  			 &advance);
  	charVector.push_back(charData);
! 	charVector[i].solidSurface = TTF_RenderGlyph_Solid(data,ch,fg);
! 	charVector[i].blendedSurface = TTF_RenderGlyph_Blended(data,ch,fg);
  	charVector[i].advance = advance;
! 	charVector[i].yoffset = TTF_FontAscent(data) - maxy;
  	charVector[i].blendedColor = fg;
  	charVector[i].solidColor = fg;
--- 375,395 ----
  			 &advance);
  	charVector.push_back(charData);
! 	if(pApp->getUTF8())
! 	  {
! 	    charVector[i].solidSurface = TTF_RenderUTF8_Solid(data,ch,fg);
! 	    charVector[i].blendedSurface = TTF_RenderUTF8_Blended(data,ch,fg);
! 	  }
! 	else
! 	  {
! 	    charVector[i].solidSurface = TTF_RenderText_Solid(data,ch,fg);
! 	    charVector[i].blendedSurface = TTF_RenderText_Blended(data,ch,fg);
! 	  }
! 	if(charVector[i].blendedSurface!=NULL) 
! 	  SDL_SetAlpha(charVector[i].blendedSurface, 0, 0);
! 
! // 	charVector[i].solidSurface = TTF_RenderGlyph_Solid(data,ch[0],fg);
! // 	charVector[i].blendedSurface = TTF_RenderGlyph_Blended(data,ch[0],fg);
  	charVector[i].advance = advance;
! 	charVector[i].yoffset = 0;//TTF_FontAscent(data) - maxy;
  	charVector[i].blendedColor = fg;
  	charVector[i].solidColor = fg;