[aedGUI-cvs] aedGUI/src aedButton.cpp,1.1,1.2 aedEditableText.cpp,1.5,1.6 aedStaticText.cpp,1.5,1.6 aedTextBox.cpp,1.2,1.3

[<edu...@us...>]

Update of /cvsroot/aedgui/aedGUI/src
In directory sc8-pr-cvs1:/tmp/cvs-serv32685

Modified Files:
	aedButton.cpp aedEditableText.cpp aedStaticText.cpp 
	aedTextBox.cpp 
Log Message:

Fixed the blinking problem (and the caret size) on aedEditableText. Changed
the aedStaticText default to NOT have borders. And applied Ivan's suggestion
of removing the wm_paint from aedStaticText.


Index: aedButton.cpp
===================================================================
RCS file: /cvsroot/aedgui/aedGUI/src/aedButton.cpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** aedButton.cpp	29 Jun 2003 23:27:37 -0000	1.1
--- aedButton.cpp	12 Jul 2003 12:48:47 -0000	1.2
***************
*** 106,110 ****
      {
          aedRect pos = getMyPosition();
- 
          aedUpdateManager::addRect(pos);
      }
--- 106,109 ----

Index: aedEditableText.cpp
===================================================================
RCS file: /cvsroot/aedgui/aedGUI/src/aedEditableText.cpp,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** aedEditableText.cpp	12 Jul 2003 08:55:46 -0000	1.5
--- aedEditableText.cpp	12 Jul 2003 12:48:47 -0000	1.6
***************
*** 239,250 ****
  	}
  
- 	if ( s1 )
- 	{
      	dest = getMyPosition().getSDLRect();
      	dest.x += cPad + 1;
      	dest.y += cPad;
      	dest.w -= cPad * 2 + 2;
! 	    dest.h -= cPad * 2;
  
  		if ( width1 < m_StartPixel )
  		{
--- 239,252 ----
  	}
  
      	dest = getMyPosition().getSDLRect();
      	dest.x += cPad + 1;
      	dest.y += cPad;
      	dest.w -= cPad * 2 + 2;
!         dest.h -= cPad * 3;
  
+ 
+ 
+ 	if ( s1 )
+ 	{
  		if ( width1 < m_StartPixel )
  		{

Index: aedStaticText.cpp
===================================================================
RCS file: /cvsroot/aedgui/aedGUI/src/aedStaticText.cpp,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** aedStaticText.cpp	11 Jul 2003 14:21:33 -0000	1.5
--- aedStaticText.cpp	12 Jul 2003 12:48:47 -0000	1.6
***************
*** 4,8 ****
  aedStaticText::aedStaticText()
  {
!     m_Border = true;
      m_IsStatic = true;
      m_TextChanged = true;
--- 4,8 ----
  aedStaticText::aedStaticText()
  {
!     m_Border = false;
      m_IsStatic = true;
      m_TextChanged = true;
***************
*** 164,168 ****
  	// we're going to rewrite the rendering system after 0.1.6 anyway :)
  	// -- Ivan
! 	getParent()->wm_paint(screen, rect.x, rect.y, rect.w, rect.h);
  
      if ( ( myPos.getWidth() <= 4 ) || ( myPos.getHeight() <= 4 ) )
--- 164,168 ----
  	// we're going to rewrite the rendering system after 0.1.6 anyway :)
  	// -- Ivan
! 	//getParent()->wm_paint(screen, rect.x, rect.y, rect.w, rect.h);
  
      if ( ( myPos.getWidth() <= 4 ) || ( myPos.getHeight() <= 4 ) )

Index: aedTextBox.cpp
===================================================================
RCS file: /cvsroot/aedgui/aedGUI/src/aedTextBox.cpp,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** aedTextBox.cpp	9 Jul 2003 20:43:42 -0000	1.2
--- aedTextBox.cpp	12 Jul 2003 12:48:47 -0000	1.3
***************
*** 52,59 ****
  aedTextBox::wm_lbuttondown(Uint16 x, Uint16 y)
  {
! 	m_editText.wm_lbuttondown(x, y);
! 
      setRenderState(true);
! 	return(0);
  }
  
--- 52,58 ----
  aedTextBox::wm_lbuttondown(Uint16 x, Uint16 y)
  {
!     m_editText.wm_lbuttondown(x, y);
      setRenderState(true);
!     return(0);
  }