Fixed auto-resizing behavior when double-clicking a splitter; Added wxPropertyGrid::ResetColumnSizes(); wxPropertyGrid::GetSplitterPosition() got splitterIndex argument
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@63502 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -1106,25 +1106,31 @@ void wxPropertyGridPageState::CheckColumnWidths( int widthChange )
|
||||
//
|
||||
// Generic re-center code
|
||||
//
|
||||
|
||||
// Calculate sum of proportions
|
||||
int psum = 0;
|
||||
for ( i=0; i<m_colWidths.size(); i++ )
|
||||
psum += m_columnProportions[i];
|
||||
int puwid = (pg->m_width*256) / psum;
|
||||
int cpos = 0;
|
||||
|
||||
for ( i=0; i<(m_colWidths.size() - 1); i++ )
|
||||
{
|
||||
int cwid = (puwid*m_columnProportions[i]) / 256;
|
||||
cpos += cwid;
|
||||
DoSetSplitterPosition(cpos, i,
|
||||
wxPG_SPLITTER_FROM_AUTO_CENTER);
|
||||
}
|
||||
ResetColumnSizes(wxPG_SPLITTER_FROM_AUTO_CENTER);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
void wxPropertyGridPageState::ResetColumnSizes( int setSplitterFlags )
|
||||
{
|
||||
unsigned int i;
|
||||
// Calculate sum of proportions
|
||||
int psum = 0;
|
||||
for ( i=0; i<m_colWidths.size(); i++ )
|
||||
psum += m_columnProportions[i];
|
||||
int puwid = (m_pPropGrid->m_width*256) / psum;
|
||||
int cpos = 0;
|
||||
|
||||
// Convert proportion to splitter positions
|
||||
for ( i=0; i<(m_colWidths.size() - 1); i++ )
|
||||
{
|
||||
int cwid = (puwid*m_columnProportions[i]) / 256;
|
||||
cpos += cwid;
|
||||
DoSetSplitterPosition(cpos, i,
|
||||
setSplitterFlags);
|
||||
}
|
||||
}
|
||||
|
||||
void wxPropertyGridPageState::SetColumnCount( int colCount )
|
||||
{
|
||||
wxASSERT( colCount >= 2 );
|
||||
|
Reference in New Issue
Block a user