Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix the bug with not showing all the text in the text control even if there is enough space (replaces patch 1716758)

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@48714 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2007-09-15 23:35:18 +00:00
parent f527e69e7c
commit 86a41088fd
1 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/univ/textctrl.cpp
View File

@@ -2442,9 +2442,12 @@ void wxTextCtrl::UpdateLastVisible()
{ {
case wxTE_HT_BEYOND: case wxTE_HT_BEYOND:
// everything is visible // everything is visible
SData().m_ofsHorz = 0;
SData().m_colStart = 0;
SData().m_colLastVisible = text.length(); SData().m_colLastVisible = text.length();
// calc it below // calculate it below
SData().m_posLastVisible = -1; SData().m_posLastVisible = -1;
break; break;
@@ -3262,7 +3265,7 @@ bool wxTextCtrl::GetLineAndRow(wxTextCoord row,
fine for vertical scrolling as all lines have the same height but is rather fine for vertical scrolling as all lines have the same height but is rather
ugly for horizontal scrolling if proportional font is used. This is why we ugly for horizontal scrolling if proportional font is used. This is why we
manually update and use SData().m_ofsHorz which contains the length of the string manually update and use SData().m_ofsHorz which contains the length of the string
which is hidden beyond the left borde. An important property of text which is hidden beyond the left border. An important property of text
controls using this kind of scrolling is that an entire number of characters controls using this kind of scrolling is that an entire number of characters
is always shown and that parts of characters never appear on display - is always shown and that parts of characters never appear on display -
neither in the leftmost nor rightmost positions. neither in the leftmost nor rightmost positions.
@@ -3277,7 +3280,7 @@ void wxTextCtrl::ShowHorzPosition(wxCoord pos)
// pos is the logical position to show // pos is the logical position to show
// SData().m_ofsHorz is the fisrt logical position shown // SData().m_ofsHorz is the first logical position shown
if ( pos < SData().m_ofsHorz ) if ( pos < SData().m_ofsHorz )
{ {
// scroll backwards // scroll backwards