MapBase/source-sdk-2013-mapbase
1
0
Fork 0
mirror of https://github.com/mapbase-source/source-sdk-2013.git synced 2025-03-04 09:45:26 +03:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #293 from SanyaSho/patch/richtext_selection

Browse Source 
Restore text selection code from 2007 SDK
This commit is contained in:
Blixibon 2025-02-09 11:48:01 -06:00 committed by GitHub
commit 91100ea359
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 17 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
sp/src/vgui2/vgui_controls/RichText.cpp
View File

@ -847,34 +847,40 @@ void RichText::Paint()
// 3. // 3.
// Calculate the range of text to draw all at once // Calculate the range of text to draw all at once
int iLim = m_TextStream.Count(); int iLim = m_TextStream.Count() - 1;
// Stop at the next line break
if ( m_LineBreaks.IsValidIndex( lineBreakIndexIndex ) && m_LineBreaks[lineBreakIndexIndex] <= iLim )
iLim = m_LineBreaks[lineBreakIndexIndex] - 1;
// Stop at the next format change // Stop at the next format change
if ( m_FormatStream.IsValidIndex(renderState.formatStreamIndex) && if ( m_FormatStream.IsValidIndex(renderState.formatStreamIndex) &&
m_FormatStream[renderState.formatStreamIndex].textStreamIndex < iLim && m_FormatStream[renderState.formatStreamIndex].textStreamIndex <= iLim &&
m_FormatStream[renderState.formatStreamIndex].textStreamIndex >= i && m_FormatStream[renderState.formatStreamIndex].textStreamIndex >= i &&
m_FormatStream[renderState.formatStreamIndex].textStreamIndex ) m_FormatStream[renderState.formatStreamIndex].textStreamIndex )
{ {
iLim = m_FormatStream[renderState.formatStreamIndex].textStreamIndex; iLim = m_FormatStream[renderState.formatStreamIndex].textStreamIndex - 1;
} }
// Stop at the next line break // Stop when entering or exiting the selected range
if ( m_LineBreaks.IsValidIndex( lineBreakIndexIndex ) && m_LineBreaks[lineBreakIndexIndex] < iLim ) if ( i < selection0 && iLim >= selection0 )
iLim = m_LineBreaks[lineBreakIndexIndex]; iLim = selection0 - 1;
if ( i >= selection0 && i < selection1 && iLim >= selection1 )
iLim = selection1 - 1;
// Handle non-drawing characters specially // Handle non-drawing characters specially
for ( int iT = i; iT < iLim; iT++ ) for ( int iT = i; iT <= iLim; iT++ )
{ {
if ( iswcntrl(m_TextStream[iT]) ) if ( iswcntrl(m_TextStream[iT]) )
{ {
iLim = iT; iLim = iT - 1;
break; break;
} }
} }
// 4. // 4.
// Draw the current text range // Draw the current text range
if ( iLim <= i ) if ( iLim < i )
{ {
if ( m_TextStream[i] == '\t' ) if ( m_TextStream[i] == '\t' )
{ {
@ -887,8 +893,8 @@ void RichText::Paint()
} }
else else
{ {
renderState.x += DrawString(i, iLim - 1, renderState, hFontCurrent ); renderState.x += DrawString(i, iLim, renderState, hFontCurrent );
i = iLim; i = iLim + 1;
} }
} }