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

Fixes for visibility, GetVisibleLineForCaretPosition, and bitmap drawing slowness

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@77881 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Julian Smart
2014-09-24 12:59:11 +00:00
parent 550b039d6c
commit 08f4911e73
1 changed files with 15 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
src/richtext/richtextctrl.cpp
View File

@@ -1965,10 +1965,12 @@ bool wxRichTextCtrl::IsPositionVisible(long pos) const
wxRect rect = GetScaledRect(line->GetRect()); wxRect rect = GetScaledRect(line->GetRect());
wxSize clientSize = GetClientSize(); wxSize clientSize = GetClientSize();
clientSize.y -= (int) (0.5 + GetBuffer().GetBottomMargin() * GetScale());
return (rect.GetTop() >= (startY + (int) (0.5 + GetBuffer().GetTopMargin() * GetScale()))) && int topMargin = (int) (0.5 + GetBuffer().GetTopMargin() * GetScale());
(rect.GetBottom() <= (startY + clientSize.y)); int bottomMargin = (int) (0.5 + GetBuffer().GetBottomMargin() * GetScale());
return (rect.GetTop() >= (startY + topMargin)) &&
(rect.GetBottom() <= (startY + clientSize.y - bottomMargin));
} }
void wxRichTextCtrl::SetCaretPosition(long position, bool showAtLineStart) void wxRichTextCtrl::SetCaretPosition(long position, bool showAtLineStart)
@@ -3012,7 +3014,14 @@ bool wxRichTextCtrl::RecreateBuffer(const wxSize& size)
return false; return false;
if (!m_bufferBitmap.IsOk() || m_bufferBitmap.GetWidth() < sz.x || m_bufferBitmap.GetHeight() < sz.y) if (!m_bufferBitmap.IsOk() || m_bufferBitmap.GetWidth() < sz.x || m_bufferBitmap.GetHeight() < sz.y)
// As per http://trac.wxwidgets.org/ticket/14403, prevent very inefficient fix to alpha bits of
// destination by making the backing bitmap 24-bit. Note that using 24-bit depth breaks painting of
// scrolled areas on wxWidgets 2.8.
#if defined(__WXMSW__) && wxCHECK_VERSION(3,0,0)
m_bufferBitmap = wxBitmap(sz.x, sz.y, 24);
#else
m_bufferBitmap = wxBitmap(sz.x, sz.y); m_bufferBitmap = wxBitmap(sz.x, sz.y);
#endif
return m_bufferBitmap.IsOk(); return m_bufferBitmap.IsOk();
} }
#endif #endif
@@ -4215,7 +4224,9 @@ wxRichTextLine* wxRichTextCtrl::GetVisibleLineForCaretPosition(long caretPositio
if (caretPosition == lineRange.GetStart()-1 && if (caretPosition == lineRange.GetStart()-1 &&
(para->GetRange().GetStart() != lineRange.GetStart())) (para->GetRange().GetStart() != lineRange.GetStart()))
{ {
if (!m_caretAtLineStart) // Only test for caret start/end position if we're looking at the current caret position,
// otherwise m_caretAtLineStart is meaningless
if (!m_caretAtLineStart && (caretPosition == m_caretPosition))
line = GetFocusObject()->GetLineAtPosition(caretPosition-1, true); line = GetFocusObject()->GetLineAtPosition(caretPosition-1, true);
} }
} }