Fix cropping detection for cells with custom font
This commit is contained in:
committed by
Artur Wieczorek
parent
ca1e086225
commit
2d8d1ad9d0
@@ -5122,9 +5122,11 @@ bool wxPropertyGrid::HandleMouseMove( int x, unsigned int y,
|
|||||||
space -= m_propHover->GetImageOffset(imageWidth);
|
space -= m_propHover->GetImageOffset(imageWidth);
|
||||||
space -= (wxPG_XBEFORETEXT + 1);
|
space -= (wxPG_XBEFORETEXT + 1);
|
||||||
int tw, th;
|
int tw, th;
|
||||||
wxFont* font = NULL;
|
const wxFont* font = NULL;
|
||||||
if ( (m_windowStyle & wxPG_BOLD_MODIFIED) && m_propHover->HasFlag(wxPG_PROP_MODIFIED) )
|
if ( (m_windowStyle & wxPG_BOLD_MODIFIED) && m_propHover->HasFlag(wxPG_PROP_MODIFIED) )
|
||||||
font = &m_captionFont;
|
font = &m_captionFont;
|
||||||
|
if ( cell.GetFont().IsOk() )
|
||||||
|
font = &cell.GetFont();
|
||||||
GetTextExtent( tipString, &tw, &th, 0, 0, font );
|
GetTextExtent( tipString, &tw, &th, 0, 0, font );
|
||||||
if ( tw > space )
|
if ( tw > space )
|
||||||
SetToolTip( tipString );
|
SetToolTip( tipString );
|
||||||
|
|||||||
Reference in New Issue
Block a user