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

Fix cropping detection for properties with choice item-specific images

Browse Source
This commit is contained in:
Pavel Tyunin
2020-09-18 13:42:31 +03:00
committed by Artur Wieczorek
parent 3d41fa1ac4
commit 4c11ab63c1
1 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/propgrid/propgrid.cpp
View File

@@ -5085,11 +5085,13 @@ bool wxPropertyGrid::HandleMouseMove( int x, unsigned int y,
{ {
// Show cropped value string as a tooltip // Show cropped value string as a tooltip
wxString tipString; wxString tipString;
m_propHover->GetDisplayInfo(m_colHover, -1, 0, &tipString, (wxPGCell*)NULL); wxPGCell cell;
int item = ( m_colHover == 1 ? m_propHover->GetChoiceSelection() : -1 );
m_propHover->GetDisplayInfo(m_colHover, item, 0, &tipString, &cell);
int space = m_pState->GetColumnWidth(m_colHover); int space = m_pState->GetColumnWidth(m_colHover);
int imageWidth = 0; int imageWidth = 0;
const wxBitmap& bmp = m_propHover->GetCell(m_colHover).GetBitmap(); const wxBitmap& bmp = cell.GetBitmap();
if ( bmp.IsOk() ) if ( bmp.IsOk() )
{ {
imageWidth = bmp.GetWidth(); imageWidth = bmp.GetWidth();
@@ -5108,6 +5110,7 @@ bool wxPropertyGrid::HandleMouseMove( int x, unsigned int y,
wxSize imageSize = GetImageSize(m_propHover, -1); wxSize imageSize = GetImageSize(m_propHover, -1);
if ( imageSize.x > 0 ) if ( imageSize.x > 0 )
imageWidth = imageSize.x; imageWidth = imageSize.x;
tipString = m_propHover->GetValueAsString();
} }
space -= m_propHover->GetImageOffset(imageWidth); space -= m_propHover->GetImageOffset(imageWidth);