mirror of https://github.com/buggins/dlangui.git
Improved grid measure.
This commit is contained in:
parent
1bba303cc3
commit
17d4995e98
|
|
@ -1601,16 +1601,18 @@ class GridWidgetBase : ScrollWidgetBase, GridModelAdapter, MenuItemActionHandler
|
|||
}
|
||||
|
||||
// width:
|
||||
for (int i = 0 ; i < min(_cols, _minVisibleCols) ; i++)
|
||||
int firstVisibleCol = (showRowHeaders) ? 0 : _headerCols;
|
||||
for (int i = firstVisibleCol ; i < min(_cols, _minVisibleCols + firstVisibleCol) ; i++)
|
||||
sz.x += _colWidths[i];
|
||||
|
||||
|
||||
// height
|
||||
for (int i = 0 ; i < min(_rows, _minVisibleRows) ; i++)
|
||||
int firstVisibleRow = (showColHeaders) ? 0 : _headerRows;
|
||||
for (int i = firstVisibleRow ; i < min(_rows, _minVisibleRows + firstVisibleRow) ; i++)
|
||||
sz.y += _rowHeights[i];
|
||||
|
||||
if (_rows<_minVisibleRows)
|
||||
sz.y += (_minVisibleRows - _rows) * _rowHeights[_rows-1];
|
||||
|
||||
|
||||
return sz;
|
||||
}
|
||||
|
||||
|
|
|
|||
Loading…
Reference in New Issue