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

Fixed label editor position for child properties

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@63686 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Jaakko Salli
2010-03-14 17:15:17 +00:00
parent 968d3a2461
commit be7e10393a
1 changed files with 14 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
src/propgrid/propgrid.cpp
View File

@@ -3580,14 +3580,21 @@ wxRect wxPropertyGrid::GetEditorWidgetRect( wxPGProperty* p, int column ) const
GetViewStart(&vx, &vy); GetViewStart(&vx, &vy);
vy *= wxPG_PIXELS_PER_UNIT; vy *= wxPG_PIXELS_PER_UNIT;
// TODO: If custom image detection changes from current, change this. if ( column == 1 )
if ( m_iFlags & wxPG_FL_CUR_USES_CUSTOM_IMAGE )
{ {
//m_iFlags |= wxPG_FL_CUR_USES_CUSTOM_IMAGE; // TODO: If custom image detection changes from current, change this.
int iw = p->OnMeasureImage().x; if ( m_iFlags & wxPG_FL_CUR_USES_CUSTOM_IMAGE )
if ( iw < 1 ) {
iw = wxPG_CUSTOM_IMAGE_WIDTH; //m_iFlags |= wxPG_FL_CUR_USES_CUSTOM_IMAGE;
imageOffset = p->GetImageOffset(iw); int iw = p->OnMeasureImage().x;
if ( iw < 1 )
iw = wxPG_CUSTOM_IMAGE_WIDTH;
imageOffset = p->GetImageOffset(iw);
}
}
else if ( column == 0 )
{
splitterX += (p->m_depth - 1) * m_subgroup_extramargin;
} }
return wxRect return wxRect