Fix the calculated last column width in StringGrid Mediator.

Signed-off-by: Graeme Geldenhuys <graeme@mastermaths.co.za>

1 files changed, 11 insertions, 3 deletions

diff --git a/extras/tiopf/gui/tiListMediators.pas b/extras/tiopf/gui/tiListMediators.pas
index 13fd4fcc..c0c5f5a5 100644
--- a/extras/tiopf/gui/tiListMediators.pas
+++ b/extras/tiopf/gui/tiListMediators.pas
@@ -453,8 +453,12 @@ procedure TStringGridMediator.CreateColumns;
 var
   i: integer;
   lColumnTotalWidth: integer;
+  lGridNonContentWidth: integer;
+  lLastColumnWidth: integer;
 begin
   lColumnTotalWidth := 0;
+  // Grid is 2px border left + right, 1px col gridline separator, 15px vertical scrollbar width
+  lGridNonContentWidth := 2 + 2 + (FieldsInfo.Count - 1) + 15;
   for i := 0 to FieldsInfo.Count - 1 do
   begin
     FView.ColumnWidth[i]       := FieldsInfo[i].FieldWidth;
@@ -463,11 +467,15 @@ begin
     //resize the last column to fill the grid.
     if i = FieldsInfo.Count - 1 then
     begin
-      if FView.Width > (lColumnTotalWidth + 10) then
-        FView.ColumnWidth[i] := FView.Width - (lColumnTotalWidth + 10);
+      if FView.Width > (lColumnTotalWidth + lGridNonContentWidth) then
+      begin
+        lLastColumnWidth := FView.Width - (lColumnTotalWidth + lGridNonContentWidth);
+        if lLastColumnWidth > 10 then
+          FView.ColumnWidth[i] := lLastColumnWidth;
+      end;
     end
     else
-      lColumnTotalWidth := lColumnTotalWidth + FView.ColumnWidth[i] + 20;
+      lColumnTotalWidth := lColumnTotalWidth + FView.ColumnWidth[i];
   end;
 end;