wgui-cvs

[Rob W. <gre...@us...>]

Update of /cvsroot/wgui/wgui/wgui_ex/src
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv18181/wgui_ex/src

Modified Files:
	wgex_bufferdisplay.cpp wgex_display.cpp wgex_tooltip.cpp 
Log Message:
Draw architecture changes.

Index: wgex_tooltip.cpp
===================================================================
RCS file: /cvsroot/wgui/wgui/wgui_ex/src/wgex_tooltip.cpp,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** wgex_tooltip.cpp	12 Nov 2003 18:35:21 -0000	1.2
--- wgex_tooltip.cpp	16 Jul 2004 16:41:36 -0000	1.3
***************
*** 29,33 ****
  {
  
! CShadeToolTip::CShadeToolTip( CWindow* pToolWindow, std::string sText, CRGBColor& FontColor, CRGBColor& BGColor, CFontEngine* pFontEngine ) :
  	CWindow( CRect(), pToolWindow ),
  	m_FontColor( FontColor ),
--- 29,33 ----
  {
  
! CShadeToolTip::CShadeToolTip( CWindow* pToolWindow, std::string sText, CRGBColor& FontColor, CRGBColor& BackgroundColor, CFontEngine* pFontEngine ) :
  	CWindow( CRect(), pToolWindow ),
  	m_FontColor( FontColor ),
***************
*** 43,47 ****
  	m_pTimer = new CTimer(this);
  
! 	m_BGColor = BGColor;
  	CMessageServer::Instance().RegisterMessageClient(this, CMessage::MOUSE_MOVE);
  	CMessageServer::Instance().RegisterMessageClient(this, CMessage::CTRL_TIMER);
--- 43,47 ----
  	m_pTimer = new CTimer(this);
  
! 	m_BackgroundColor = BackgroundColor;
  	CMessageServer::Instance().RegisterMessageClient(this, CMessage::MOUSE_MOVE);
  	CMessageServer::Instance().RegisterMessageClient(this, CMessage::CTRL_TIMER);
***************
*** 60,64 ****
  	CRenderedString RenderedString( m_pFontEngine, m_sWindowText,
  		CRenderedString::VALIGN_TOP, CRenderedString::HALIGN_CENTER );
! 	
  	CPoint Dims;
  	RenderedString.GetMetrics(&Dims, 0, 0);
--- 60,64 ----
  	CRenderedString RenderedString( m_pFontEngine, m_sWindowText,
  		CRenderedString::VALIGN_TOP, CRenderedString::HALIGN_CENTER );
! 
  	CPoint Dims;
  	RenderedString.GetMetrics(&Dims, 0, 0);
***************
*** 104,112 ****
  
  	// blit the outbound rect
! 	painter.DrawFilledRectAlpha(m_WindowRect, m_BGColor, m_iAlpha );
  
  	// blit the outbound rect
! 	painter.DrawRect(m_WindowRect, m_BGColor );
! 	
  	CRect SubRect(m_WindowRect);
  	SubRect.Grow(-2);
--- 104,112 ----
  
  	// blit the outbound rect
! 	painter.DrawFilledRectAlpha(m_WindowRect, m_BackgroundColor, m_iAlpha );
  
  	// blit the outbound rect
! 	painter.DrawRect(m_WindowRect, m_BackgroundColor );
! 
  	CRect SubRect(m_WindowRect);
  	SubRect.Grow(-2);

Index: wgex_bufferdisplay.cpp
===================================================================
RCS file: /cvsroot/wgui/wgui/wgui_ex/src/wgex_bufferdisplay.cpp,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** wgex_bufferdisplay.cpp	26 Feb 2004 17:00:36 -0000	1.8
--- wgex_bufferdisplay.cpp	16 Jul 2004 16:41:36 -0000	1.9
***************
*** 281,285 ****
  			DrawWaveDisabled( Painter );
  			Inset.Grow(+2);
! 			Painter.DrawFilledRect( Inset, m_BGColor );
  			Painter.DrawPanelOutset( Inset, true );
  			return;
--- 281,285 ----
  			DrawWaveDisabled( Painter );
  			Inset.Grow(+2);
! 			Painter.DrawFilledRect( Inset, m_BackgroundColor );
  			Painter.DrawPanelOutset( Inset, true );
  			return;

Index: wgex_display.cpp
===================================================================
RCS file: /cvsroot/wgui/wgui/wgui_ex/src/wgex_display.cpp,v
retrieving revision 1.13
retrieving revision 1.14
diff -C2 -d -r1.13 -r1.14
*** wgex_display.cpp	26 Nov 2003 16:54:52 -0000	1.13
--- wgex_display.cpp	16 Jul 2004 16:41:36 -0000	1.14
***************
*** 41,47 ****
  	m_bHaveValueText( bHaveText )
  {
! 	m_BGColor = COLOR_PANEL_HI;
  	m_bMousable = true;
! 	
  	m_bReleased = false;
  	m_fRelease = 1.0f;
--- 41,47 ----
  	m_bHaveValueText( bHaveText )
  {
! 	m_BackgroundColor = COLOR_PANEL_HI;
  	m_bMousable = true;
! 
  	m_bReleased = false;
  	m_fRelease = 1.0f;
***************
*** 78,82 ****
  
  	// fill with background --
! 	Painter.DrawFilledRect( m_WindowRect, m_BGColor );
  
  	// draw a panel inset + inside --
--- 78,82 ----
  
  	// fill with background --
! 	Painter.DrawFilledRect( m_WindowRect, m_BackgroundColor );
  
  	// draw a panel inset + inside --
***************
*** 186,190 ****
  
   	if (! CWindow::OnMouseButtonDown(Point, Button) && m_bVisible && m_bMousable
! 		&& (m_WindowRect.HitTest(Point) == CRect::RELPOS_INSIDE) 
  		&& CApplication::Instance()->GetMouseFocus() == 0 )
  	{
--- 186,190 ----
  
   	if (! CWindow::OnMouseButtonDown(Point, Button) && m_bVisible && m_bMousable
! 		&& (m_WindowRect.HitTest(Point) == CRect::RELPOS_INSIDE)
  		&& CApplication::Instance()->GetMouseFocus() == 0 )
  	{
***************
*** 210,214 ****
  				break;
  			}
! 	
  			case CMouseMessage::MIDDLE:
  			{
--- 210,214 ----
  				break;
  			}
! 
  			case CMouseMessage::MIDDLE:
  			{
***************
*** 225,229 ****
  				CMessageServer::Instance().QueueMessage(
  					new TFloatMessage(CMessage::CTRL_VALUECHANGE, m_pParentWindow, this, m_fValue) );
! 				
  				// set display and draw !
  				SetDisplayFloat( m_fValue );
--- 225,229 ----
  				CMessageServer::Instance().QueueMessage(
  					new TFloatMessage(CMessage::CTRL_VALUECHANGE, m_pParentWindow, this, m_fValue) );
! 
  				// set display and draw !
  				SetDisplayFloat( m_fValue );
***************
*** 276,280 ****
  				break;
  			}
! 	
  			case CMouseMessage::MIDDLE:
  			{
--- 276,280 ----
  				break;
  			}
! 
  			case CMouseMessage::MIDDLE:
  			{
***************
*** 292,296 ****
  				else
  					m_bReleased = false;
! 		
  				bResult = true;
  				break;
--- 292,296 ----
  				else
  					m_bReleased = false;
! 
  				bResult = true;
  				break;
***************
*** 338,342 ****
  				case TOP2BOTTOM:
  					m_fRelease = dx / 1000.0f - dy / 100.0f ;
! 					m_fValue -= dx / 5000.0f - dy / 200.0f ; 
  					break;
  				case BOTTOM2TOP:
--- 338,342 ----
  				case TOP2BOTTOM:
  					m_fRelease = dx / 1000.0f - dy / 100.0f ;
! 					m_fValue -= dx / 5000.0f - dy / 200.0f ;
  					break;
  				case BOTTOM2TOP:
***************
*** 365,369 ****
  						break;
  					}
! 	
  					case CMouseMessage::MIDDLE: {
  						bHandled = true;
--- 365,369 ----
  						break;
  					}
! 
  					case CMouseMessage::MIDDLE: {
  						bHandled = true;
***************
*** 530,534 ****
  
  	// fill with background --
! 	Painter.DrawFilledRect( m_WindowRect, m_BGColor );
  
  	// draw title text --
--- 530,534 ----
  
  	// fill with background --
! 	Painter.DrawFilledRect( m_WindowRect, m_BackgroundColor );
  
  	// draw title text --
***************
*** 614,618 ****
  
   	if (! CWindow::OnMouseButtonDown(Point, Button) && m_bVisible && m_bMousable
! 		&& (m_WindowRect.HitTest(Point) == CRect::RELPOS_INSIDE) 
  		&& CApplication::Instance()->GetMouseFocus() == 0 )
  	{
--- 614,618 ----
  
   	if (! CWindow::OnMouseButtonDown(Point, Button) && m_bVisible && m_bMousable
! 		&& (m_WindowRect.HitTest(Point) == CRect::RELPOS_INSIDE)
  		&& CApplication::Instance()->GetMouseFocus() == 0 )
  	{