From 17d4995e989f928274c6634eb973ba99810c9119 Mon Sep 17 00:00:00 2001
From: and3md <and3md@gmail.com>
Date: Sat, 19 Aug 2017 15:38:53 +0200
Subject: [PATCH] Improved grid measure.

---
 src/dlangui/widgets/grid.d | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/src/dlangui/widgets/grid.d b/src/dlangui/widgets/grid.d
index 0cc5d603..b214768c 100644
--- a/src/dlangui/widgets/grid.d
+++ b/src/dlangui/widgets/grid.d
@@ -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;
     }