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

Improve cropping detection for properties with images

Browse Source 
Take into account images in >2 columns and custom sized images
This commit is contained in:
Pavel Tyunin
2020-09-15 16:38:34 +03:00
committed by Artur Wieczorek
parent 47d8299c70
commit 949cda937d
1 changed files with 15 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
src/propgrid/propgrid.cpp
View File

@@ -5088,19 +5088,29 @@ bool wxPropertyGrid::HandleMouseMove( int x, unsigned int y,
m_propHover->GetDisplayInfo(m_colHover, -1, 0, &tipString, (wxPGCell*)NULL); m_propHover->GetDisplayInfo(m_colHover, -1, 0, &tipString, (wxPGCell*)NULL);
int space = m_pState->GetColumnWidth(m_colHover); int space = m_pState->GetColumnWidth(m_colHover);
int imageWidth = 0;
const wxBitmap& bmp = m_propHover->GetCell(m_colHover).GetBitmap();
if ( bmp.IsOk() )
{
imageWidth = bmp.GetWidth();
int hMax = m_lineHeight - wxPG_CUSTOM_IMAGE_SPACINGY - 1;
if ( bmp.GetHeight() > hMax )
imageWidth *= (double)hMax / bmp.GetHeight();
}
if ( m_colHover == 0 ) if ( m_colHover == 0 )
{ {
if ( !(m_windowStyle & wxPG_HIDE_CATEGORIES) || m_propHover->GetParent() != m_pState->DoGetRoot() ) if ( !(m_windowStyle & wxPG_HIDE_CATEGORIES) || m_propHover->GetParent() != m_pState->DoGetRoot() )
space -= (m_propHover->GetDepth()-1)*m_subgroup_extramargin; space -= (m_propHover->GetDepth()-1)*m_subgroup_extramargin;
} }
else if ( m_colHover == 1 ) else if ( m_colHover == 1 && !m_propHover->IsValueUnspecified())
{ {
if ( m_propHover->HasFlag(wxPG_PROP_CUSTOMIMAGE) ) wxSize imageSize = GetImageSize(m_propHover, -1);
space -= wxPG_CUSTOM_IMAGE_WIDTH + if ( imageSize.x > 0 )
wxCC_CUSTOM_IMAGE_MARGIN1 + imageWidth = imageSize.x;
wxCC_CUSTOM_IMAGE_MARGIN2;
} }
space -= m_propHover->GetImageOffset(imageWidth);
space -= (wxPG_XBEFORETEXT + 1); space -= (wxPG_XBEFORETEXT + 1);
int tw, th; int tw, th;
GetTextExtent( tipString, &tw, &th, 0, 0 ); GetTextExtent( tipString, &tw, &th, 0, 0 );