[Wgui-cvs] wgui/src wg_listbox.cpp,1.45,1.46 wg_renderedstring.cpp,1.15,1.16 wg_textbox.cpp,1.27,1.28

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

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

Modified Files:
	wg_listbox.cpp wg_renderedstring.cpp wg_textbox.cpp 
Log Message:
Code cleanup.

Index: wg_listbox.cpp
===================================================================
RCS file: /cvsroot/wgui/wgui/src/wg_listbox.cpp,v
retrieving revision 1.45
retrieving revision 1.46
diff -C2 -d -r1.45 -r1.46
*** wg_listbox.cpp	16 Jul 2004 16:41:36 -0000	1.45
--- wg_listbox.cpp	23 Jul 2004 14:46:00 -0000	1.46
***************
*** 114,118 ****
  {
  	if (iItemIndex >= 0 && iItemIndex < stdex::safe_static_cast<int>(m_SelectedItems.size()))
! 		m_SelectedItems[iItemIndex] = bSelected;
  }
  
--- 114,118 ----
  {
  	if (iItemIndex >= 0 && iItemIndex < stdex::safe_static_cast<int>(m_SelectedItems.size()))
! 		m_SelectedItems.at(iItemIndex) = bSelected;
  }
  
***************
*** 122,126 ****
  	for (unsigned int i = 0; i < m_Items.size(); ++i)
  	{
! 		m_SelectedItems[i] = bSelected;
  	}
  }
--- 122,126 ----
  	for (unsigned int i = 0; i < m_Items.size(); ++i)
  	{
! 		m_SelectedItems.at(i) = bSelected;
  	}
  }
***************
*** 142,146 ****
  			ItemRect.ClipTo(m_ClientRect);
  			ItemRect.SetBottom(ItemRect.Bottom() - 1);
! 			if (m_SelectedItems[i])
  			{
  				Painter.DrawRect(ItemRect, true, CApplication::Instance()->GetDefaultSelectionColor(), CApplication::Instance()->GetDefaultSelectionColor());
--- 142,146 ----
  			ItemRect.ClipTo(m_ClientRect);
  			ItemRect.SetBottom(ItemRect.Bottom() - 1);
! 			if (m_SelectedItems.at(i))
  			{
  				Painter.DrawRect(ItemRect, true, CApplication::Instance()->GetDefaultSelectionColor(), CApplication::Instance()->GetDefaultSelectionColor());
***************
*** 153,157 ****
  			}
  			ItemRect.Grow(-1);
! 			m_RenderedStrings[i].Draw(m_pSDLSurface, ItemRect, ItemRect.TopLeft() + CPoint(0, 1), m_Items[i].ItemColor);
  		}
  	}
--- 153,157 ----
  			}
  			ItemRect.Grow(-1);
! 			m_RenderedStrings.at(i).Draw(m_pSDLSurface, ItemRect, ItemRect.TopLeft() + CPoint(0, 1), m_Items[i].ItemColor);
  		}
  	}

Index: wg_textbox.cpp
===================================================================
RCS file: /cvsroot/wgui/wgui/src/wg_textbox.cpp,v
retrieving revision 1.27
retrieving revision 1.28
diff -C2 -d -r1.27 -r1.28
*** wg_textbox.cpp	21 Jul 2004 18:38:23 -0000	1.27
--- wg_textbox.cpp	23 Jul 2004 14:46:00 -0000	1.28
***************
*** 195,199 ****
  
  		// move the cursor into view by scrolling if necessary
! 		int CursorPos = vCharRects[SelStartPoint.YPos()][SelStartPoint.XPos()].Left() + vOffsets[SelStartPoint.YPos()].XPos() + m_ClientRect.Left() - m_pHorizontalScrollBar->GetValue() * 10;
  		if (m_bScrollToCursor)
  		{
--- 195,200 ----
  
  		// move the cursor into view by scrolling if necessary
! 		int CursorPos = vCharRects.at(SelStartPoint.YPos()).at(SelStartPoint.XPos()).Left() +
! 			vOffsets.at(SelStartPoint.YPos()).XPos() + m_ClientRect.Left() - m_pHorizontalScrollBar->GetValue() * 10;
  		if (m_bScrollToCursor)
  		{
***************
*** 201,210 ****
  			{
  				m_pHorizontalScrollBar->SetValue(m_pHorizontalScrollBar->GetValue() - (m_ClientRect.Left() - CursorPos) / 10 - 1);
! 				CursorPos = vCharRects[SelStartPoint.YPos()][SelStartPoint.XPos()].Left() + vOffsets[SelStartPoint.YPos()].XPos() + m_ClientRect.Left() - m_pHorizontalScrollBar->GetValue() * 10;
  			}
  			if (CursorPos > m_ClientRect.Right())
  			{
  				m_pHorizontalScrollBar->SetValue(m_pHorizontalScrollBar->GetValue() + (CursorPos - m_ClientRect.Right()) / 10 + 1);
! 				CursorPos = vCharRects[SelStartPoint.YPos()][SelStartPoint.XPos()].Left() + vOffsets[SelStartPoint.YPos()].XPos() + m_ClientRect.Left() - m_pHorizontalScrollBar->GetValue() * 10;
  			}
  			if (SelStartPoint.YPos() < m_pVerticalScrollBar->GetValue())
--- 202,213 ----
  			{
  				m_pHorizontalScrollBar->SetValue(m_pHorizontalScrollBar->GetValue() - (m_ClientRect.Left() - CursorPos) / 10 - 1);
! 				CursorPos = vCharRects.at(SelStartPoint.YPos()).at(SelStartPoint.XPos()).Left() +
! 					vOffsets.at(SelStartPoint.YPos()).XPos() + m_ClientRect.Left() - m_pHorizontalScrollBar->GetValue() * 10;
  			}
  			if (CursorPos > m_ClientRect.Right())
  			{
  				m_pHorizontalScrollBar->SetValue(m_pHorizontalScrollBar->GetValue() + (CursorPos - m_ClientRect.Right()) / 10 + 1);
! 				CursorPos = vCharRects.at(SelStartPoint.YPos()).at(SelStartPoint.XPos()).Left() +
! 					vOffsets.at(SelStartPoint.YPos()).XPos() + m_ClientRect.Left() - m_pHorizontalScrollBar->GetValue() * 10;
  			}
  			if (SelStartPoint.YPos() < m_pVerticalScrollBar->GetValue())
***************
*** 225,236 ****
  			{
  				CPoint TopLeft = m_ClientRect.TopLeft() + CPoint(0, m_iRowHeight * (CurLine - m_pVerticalScrollBar->GetValue()));
! 				CRect SelRect(TopLeft, TopLeft + CPoint(vBoundingDimensions[CurLine].XPos(), m_iRowHeight - 2));
  				if (CurLine == SelStartPoint.YPos())
  				{
! 					SelRect.SetLeft(vCharRects[CurLine][SelStartPoint.XPos()].Left() + vOffsets[CurLine].XPos() + m_ClientRect.Left() - m_pHorizontalScrollBar->GetValue() * 10);
  				}
  				if (CurLine == SelEndPoint.YPos())
  				{
! 					SelRect.SetRight(vCharRects[CurLine][SelEndPoint.XPos() - 1].Right() + vOffsets[CurLine].XPos() + m_ClientRect.Left() - m_pHorizontalScrollBar->GetValue() * 10);
  				}
  				SelRect.ClipTo(m_ClientRect);
--- 228,241 ----
  			{
  				CPoint TopLeft = m_ClientRect.TopLeft() + CPoint(0, m_iRowHeight * (CurLine - m_pVerticalScrollBar->GetValue()));
! 				CRect SelRect(TopLeft, TopLeft + CPoint(vBoundingDimensions.at(CurLine).XPos(), m_iRowHeight - 2));
  				if (CurLine == SelStartPoint.YPos())
  				{
! 					SelRect.SetLeft(vCharRects.at(CurLine).at(SelStartPoint.XPos()).Left() +
! 						vOffsets.at(CurLine).XPos() + m_ClientRect.Left() - m_pHorizontalScrollBar->GetValue() * 10);
  				}
  				if (CurLine == SelEndPoint.YPos())
  				{
! 					SelRect.SetRight(vCharRects.at(CurLine).at(SelEndPoint.XPos() - 1).Right() +
! 						vOffsets.at(CurLine).XPos() + m_ClientRect.Left() - m_pHorizontalScrollBar->GetValue() * 10);
  				}
  				SelRect.ClipTo(m_ClientRect);
***************
*** 330,341 ****
  				}
  				// figure out which character was clicked on
! 				int xDelta = abs(WindowPoint.XPos() - (vCharRects[iCurLine][0].Left() + vOffsets[iCurLine].XPos() + m_ClientRect.Left()));
  				m_SelStart = 0;
! 				for (unsigned int i = 0; i < vCharRects[iCurLine].size(); ++i)
  				{
! 					if (abs(WindowPoint.XPos() - (vCharRects[iCurLine][i].Right() + vOffsets[iCurLine].XPos()
  						+ m_ClientRect.Left() - m_pHorizontalScrollBar->GetValue() * 10)) < xDelta)
  					{
! 						xDelta = abs(WindowPoint.XPos() - (vCharRects[iCurLine][i].Right() + vOffsets[iCurLine].XPos()
  							+ m_ClientRect.Left() - m_pHorizontalScrollBar->GetValue() * 10));
  						m_SelStart = i + 1;
--- 335,346 ----
  				}
  				// figure out which character was clicked on
! 				int xDelta = abs(WindowPoint.XPos() - (vCharRects.at(iCurLine).at(0).Left() + vOffsets.at(iCurLine).XPos() + m_ClientRect.Left()));
  				m_SelStart = 0;
! 				for (unsigned int i = 0; i < vCharRects.at(iCurLine).size(); ++i)
  				{
! 					if (abs(WindowPoint.XPos() - (vCharRects.at(iCurLine).at(i).Right() + vOffsets.at(iCurLine).XPos()
  						+ m_ClientRect.Left() - m_pHorizontalScrollBar->GetValue() * 10)) < xDelta)
  					{
! 						xDelta = abs(WindowPoint.XPos() - (vCharRects.at(iCurLine).at(i).Right() + vOffsets.at(iCurLine).XPos()
  							+ m_ClientRect.Left() - m_pHorizontalScrollBar->GetValue() * 10));
  						m_SelStart = i + 1;
***************
*** 344,348 ****
  				for (unsigned int iChar = 0; iChar < iCurLine; ++iChar)
  				{
! 					m_SelStart += vCharRects[iChar].size();
  				}
  			}
--- 349,353 ----
  				for (unsigned int iChar = 0; iChar < iCurLine; ++iChar)
  				{
! 					m_SelStart += vCharRects.at(iChar).size();
  				}
  			}
***************
*** 447,458 ****
  
  					// figure out which character was clicked on
! 					int xDelta = abs(WindowPoint.XPos() - (vCharRects[iCurLine][0].Left() + vOffsets[iCurLine].XPos() + m_ClientRect.Left()));
  					std::string::size_type CursorPos = 0;
! 					for (unsigned int i = 0; i < vCharRects[iCurLine].size(); ++i)
  					{
! 						if (abs(WindowPoint.XPos() - (vCharRects[iCurLine][i].Right() + vOffsets[iCurLine].XPos()
  							+ m_ClientRect.Left() - m_pHorizontalScrollBar->GetValue() * 10)) < xDelta)
  						{
! 							xDelta = abs(WindowPoint.XPos() - (vCharRects[iCurLine][i].Right() + vOffsets[iCurLine].XPos()
  								+ m_ClientRect.Left() - m_pHorizontalScrollBar->GetValue() * 10));
  							CursorPos = i + 1;
--- 452,463 ----
  
  					// figure out which character was clicked on
! 					int xDelta = abs(WindowPoint.XPos() - (vCharRects.at(iCurLine).at(0).Left() + vOffsets.at(iCurLine).XPos() + m_ClientRect.Left()));
  					std::string::size_type CursorPos = 0;
! 					for (unsigned int i = 0; i < vCharRects.at(iCurLine).size(); ++i)
  					{
! 						if (abs(WindowPoint.XPos() - (vCharRects.at(iCurLine).at(i).Right() + vOffsets.at(iCurLine).XPos()
  							+ m_ClientRect.Left() - m_pHorizontalScrollBar->GetValue() * 10)) < xDelta)
  						{
! 							xDelta = abs(WindowPoint.XPos() - (vCharRects.at(iCurLine).at(i).Right() + vOffsets.at(iCurLine).XPos()
  								+ m_ClientRect.Left() - m_pHorizontalScrollBar->GetValue() * 10));
  							CursorPos = i + 1;
***************
*** 461,465 ****
  					for (unsigned int iChar = 0; iChar < iCurLine; ++iChar)
  					{
! 						CursorPos += vCharRects[iChar].size();
  					}
  
--- 466,470 ----
  					for (unsigned int iChar = 0; iChar < iCurLine; ++iChar)
  					{
! 						CursorPos += vCharRects.at(iChar).size();
  					}
  

Index: wg_renderedstring.cpp
===================================================================
RCS file: /cvsroot/wgui/wgui/src/wg_renderedstring.cpp,v
retrieving revision 1.15
retrieving revision 1.16
diff -C2 -d -r1.15 -r1.16
*** wg_renderedstring.cpp	28 Apr 2004 15:41:46 -0000	1.15
--- wg_renderedstring.cpp	23 Jul 2004 14:46:00 -0000	1.16
***************
*** 73,77 ****
  				{
  					CRGBColor PixelColor(FontColor.red, FontColor.green, FontColor.blue, *PixelOffset);
! 					CPoint PixelPoint(CPoint(x + pGlyph->left, y) + OriginPoint + OriginOffset + CharacterRects[i].TopLeft());
  					if (BoundingRect.HitTest(PixelPoint) == CRect::RELPOS_INSIDE)
  					{
--- 73,77 ----
  				{
  					CRGBColor PixelColor(FontColor.red, FontColor.green, FontColor.blue, *PixelOffset);
! 					CPoint PixelPoint(CPoint(x + pGlyph->left, y) + OriginPoint + OriginOffset + CharacterRects.at(i).TopLeft());
  					if (BoundingRect.HitTest(PixelPoint) == CRect::RELPOS_INSIDE)
  					{
***************
*** 124,128 ****
  			}
  
- 			//FT_Glyph_Metrics* pMetrics = m_pFontEngine->GetMetrics(m_sString[i]);
  			if ((pMetrics->horiBearingY - pMetrics->height) < iMinY)
  			{
--- 124,127 ----