strepsirrhini/office-gobmx
9
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

CWS-TOOLING: integrate CWS gridcontrol07

Browse source
This commit is contained in:
Ivo Hinkelmann 2011-01-18 16:37:37 +01:00
commit b681646aed
1 changed files with 16 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
svtools/source/table/tablecontrol_impl.cxx
View file

@ -948,8 +948,16 @@ namespace svt { namespace table
//In the case that column headers are defined but data hasn't yet been set,
//only column headers will be shown
if(m_pModel->hasColumnHeaders())
{
if(m_nColHeaderHeightPixel>1)
{
m_pDataWindow->SetSizePixel( m_rAntiImpl.GetOutputSizePixel());
if(m_bResizingGrid)
//update column widths to fit in grid
impl_ni_updateColumnWidths();
m_bResizingGrid = true;
}
}
if(m_nColumnCount != 0)
impl_ni_updateScrollbars();
}
@ -2011,8 +2019,11 @@ namespace svt { namespace table
PColumnModel pColumn = m_pModel->getColumnModel(m_nCurColumn);
impl_ni_getAccVisibleColWidths();
int newColWidth = m_aColumnWidthsPixel[m_nCurColumn];
//make resize area for the separator wider
int nLeft = m_aVisibleColumnWidthsPixel[resizingColumn]-4;
//subtract 1 from m_aAccColumnWidthPixel because right border should be part of the current cell
if(m_aVisibleColumnWidthsPixel[resizingColumn]-1 == rPoint.X() && pColumn->isResizable())
int nRight = m_aVisibleColumnWidthsPixel[resizingColumn]-1;
if( rPoint.X()> nLeft && rPoint.X()<nRight && pColumn->isResizable())
aNewPointer = Pointer( POINTER_HSPLIT );
//MouseButton was pressed but not yet released, mouse is moving
if(m_bResizing)
@ -2040,7 +2051,10 @@ namespace svt { namespace table
m_bResizingGrid = false;
m_nResizingColumn = m_nCurColumn;
PColumnModel pColumn = m_pModel->getColumnModel(m_nResizingColumn);
if(m_aVisibleColumnWidthsPixel[m_nResizingColumn-m_nLeftColumn]-1 == rPoint.X() && pColumn->isResizable())
//make resize area for the separator wider
int nLeft = m_aVisibleColumnWidthsPixel[m_nResizingColumn-m_nLeftColumn]-4;
int nRight = m_aVisibleColumnWidthsPixel[m_nResizingColumn-m_nLeftColumn]-1;
if(rPoint.X()> nLeft && rPoint.X()<nRight && pColumn->isResizable())
{
m_pDataWindow->CaptureMouse();
m_bResizing = true;