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

Fix wxPropertyGrid string cropping detection (wxPG_TOOLTIPS)

Browse Source 
splitterHitOffset is only initialized when the mouse is near the splitter.
This commit is contained in:
Pavel Tyunin
2020-09-11 15:11:36 +03:00
committed by Artur Wieczorek
parent 50fc4eb1f3
commit 075d964eae
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/propgrid/propgrid.cpp
View File

@@ -5002,7 +5002,6 @@ bool wxPropertyGrid::HandleMouseMove( int x, unsigned int y,
int splitterHit; int splitterHit;
int splitterHitOffset; int splitterHitOffset;
int columnHit = state->HitTestH( x, &splitterHit, &splitterHitOffset ); int columnHit = state->HitTestH( x, &splitterHit, &splitterHitOffset );
int splitterX = x - splitterHitOffset;
m_colHover = columnHit; m_colHover = columnHit;
@@ -5012,6 +5011,7 @@ bool wxPropertyGrid::HandleMouseMove( int x, unsigned int y,
x < (m_pState->GetVirtualWidth() - wxPG_DRAG_MARGIN) ) x < (m_pState->GetVirtualWidth() - wxPG_DRAG_MARGIN) )
{ {
int splitterX = x - splitterHitOffset;
int newSplitterX = x - m_dragOffset; int newSplitterX = x - m_dragOffset;
// Splitter redraw required? // Splitter redraw required?
@@ -5098,13 +5098,13 @@ bool wxPropertyGrid::HandleMouseMove( int x, unsigned int y,
if ( m_mouseSide == 1 ) if ( m_mouseSide == 1 )
{ {
tipString = m_propHover->GetLabel(); tipString = m_propHover->GetLabel();
space = splitterX-m_marginWidth-3; space = m_pState->GetColumnWidth(0)-3;
} }
else if ( m_mouseSide == 2 ) else if ( m_mouseSide == 2 )
{ {
tipString = m_propHover->GetDisplayedString(); tipString = m_propHover->GetDisplayedString();
space = m_width - splitterX; space = m_pState->GetColumnWidth(1);
if ( m_propHover->HasFlag(wxPG_PROP_CUSTOMIMAGE) ) if ( m_propHover->HasFlag(wxPG_PROP_CUSTOMIMAGE) )
space -= wxPG_CUSTOM_IMAGE_WIDTH + space -= wxPG_CUSTOM_IMAGE_WIDTH +
wxCC_CUSTOM_IMAGE_MARGIN1 + wxCC_CUSTOM_IMAGE_MARGIN1 +