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

Fix text jumps during selection dragging on MSW

Browse Source 
When selecting the text in wxHtmlWindow by dragging the mouse the text
to the right of the selection sometimes jumps horizontally. This happens
only on MSW and only for TrueType fonts. The reason is that
wxDC::GetPartialTextExtents() and wxDC::GetTextExtent() give different
results if the text contains characters with underhangs or overhangs.

Fix this by caching results of wxDC::GetPartialTextExtents() and using
them instead of calling wxDC::GetTextExtent().
This commit is contained in:
Pavel Kalugin
2019-04-11 08:01:57 +03:00
committed by Vadim Zeitlin
parent bce4bf1c8e
commit a7dc1c0e0f
2 changed files with 32 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
include/wx/html/htmlcell.h
View File

@@ -35,7 +35,8 @@ public:
wxHtmlSelection()
: m_fromPos(wxDefaultPosition), m_toPos(wxDefaultPosition),
m_fromCharacterPos(-1), m_toCharacterPos(-1),
m_fromCell(NULL), m_toCell(NULL) {}
m_fromCell(NULL), m_toCell(NULL),
m_extBeforeSel(0), m_extBeforeSelEnd(0) {}
// this version is used for the user selection defined with the mouse
void Set(const wxPoint& fromPos, const wxHtmlCell *fromCell,
@@ -58,6 +59,11 @@ public:
wxCoord GetFromCharacterPos () const { return m_fromCharacterPos; }
wxCoord GetToCharacterPos () const { return m_toCharacterPos; }
void SetExtentBeforeSelection(unsigned ext) { m_extBeforeSel = ext; }
void SetExtentBeforeSelectionEnd(unsigned ext) { m_extBeforeSelEnd = ext; }
unsigned GetExtentBeforeSelection() const { return m_extBeforeSel; }
unsigned GetExtentBeforeSelectionEnd() const { return m_extBeforeSelEnd; }
bool IsEmpty() const
{ return m_fromPos == wxDefaultPosition &&
m_toPos == wxDefaultPosition; }
@@ -66,6 +72,12 @@ private:
wxPoint m_fromPos, m_toPos;
wxCoord m_fromCharacterPos, m_toCharacterPos;
const wxHtmlCell *m_fromCell, *m_toCell;
// Extent of the text before selection start.
unsigned m_extBeforeSel;
// Extent of the text from the beginning to the selection end.
unsigned m_extBeforeSelEnd;
};
@@ -431,7 +443,8 @@ protected:
void SetSelectionPrivPos(const wxDC& dc, wxHtmlSelection *s) const;
void Split(const wxDC& dc,
const wxPoint& selFrom, const wxPoint& selTo,
unsigned& pos1, unsigned& pos2) const;
unsigned& pos1, unsigned& pos2,
unsigned& ext1, unsigned& ext2) const;
wxString m_Word;
bool m_allowLinebreak;