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

Fixed a few bugs.

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@2758 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Karsten Ballüder
1999-06-11 09:21:49 +00:00
parent aef82f12c8
commit bbcdb973f7
1 changed files with 25 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

39
samples/richedit/wxllist.cpp
View File

@@ -1949,16 +1949,22 @@ wxLayoutList::LineBreak(void)
m_CursorLine = m_CursorLine->Break(m_CursorPos.x, this); m_CursorLine = m_CursorLine->Break(m_CursorPos.x, this);
if(setFirst) // we were at beginning of first line if(setFirst) // we were at beginning of first line
m_FirstLine = m_CursorLine->GetPreviousLine(); m_FirstLine = m_CursorLine;
wxASSERT(m_FirstLine);
if(m_CursorPos.x != 0) if(m_CursorPos.x != 0)
m_CursorPos.y++; m_CursorPos.y++;
m_CursorPos.x = 0; m_CursorPos.x = 0;
// The following code will produce a height which is guaranteed to
// be too high: old lineheight + the height of both new lines.
// We can probably drop the old line height and start with height =
// 0. FIXME
wxLayoutLine *prev = m_CursorLine->GetPreviousLine(); wxLayoutLine *prev = m_CursorLine->GetPreviousLine();
wxCHECK_MSG(prev, false, "just broke the line, where is the previous one?"); if(prev)
height += prev->GetHeight();
height += prev->GetHeight(); height += m_CursorLine->GetHeight();
m_movedCursor = true; m_movedCursor = true;
SetUpdateRect(position); SetUpdateRect(position);
@@ -2156,15 +2162,24 @@ wxLayoutList::Layout(wxDC &dc, CoordType bottom, bool forceAll,
// The following Layout() calls will update our // The following Layout() calls will update our
// m_CurrentStyleInfo if needed. // m_CurrentStyleInfo if needed.
if(line == m_CursorLine) if(line == m_CursorLine)
{
line->Layout(dc, this, line->Layout(dc, this,
(wxPoint *)&m_CursorScreenPos, (wxPoint *)&m_CursorScreenPos,
(wxPoint *)&m_CursorSize, (wxPoint *)&m_CursorSize,
&m_CursorStyleInfo, &m_CursorStyleInfo,
m_CursorPos.x); m_CursorPos.x);
if(cpos && line->GetLineNumber() == cpos->y) // we cannot layout the line twice, so copy the coords:
line->Layout(dc, this, if(cpos && line ->GetLineNumber() == cpos->y)
cpos, {
csize, NULL, cpos->x); *cpos = m_CursorScreenPos;
*csize = m_CursorSize;
}
}
else
if(cpos && line->GetLineNumber() == cpos->y)
line->Layout(dc, this,
cpos,
csize, NULL, cpos->x);
else else
line->Layout(dc, this); line->Layout(dc, this);
// little condition to speed up redrawing: // little condition to speed up redrawing:
@@ -2238,11 +2253,7 @@ wxLayoutList::Draw(wxDC &dc,
} }
line->Draw(dc, this, offset); line->Draw(dc, this, offset);
} }
#if 0 // little condition to speed up redrawing:
else
line->Layout(dc, this);
#endif
// little condition to speed up redrawing:
if(bottom != -1 && line->GetPosition().y > bottom) break; if(bottom != -1 && line->GetPosition().y > bottom) break;
line = line->GetNextLine(); line = line->GetNextLine();
} }