From 66ddbe063abd65c55b0ab645f515e2648ee9174a Mon Sep 17 00:00:00 2001
From: ondrej <ondrej@lazarus-ide.org>
Date: Thu, 17 Dec 2015 19:20:16 +0000
Subject: [PATCH] LCL: grids: support string editor alignment

git-svn-id: trunk@50874 -
---
 lcl/grids.pas                      | 7 +++++++
 lcl/interfaces/gtk2/gtk2wsgrids.pp | 2 +-
 lcl/interfaces/qt/qtwsgrids.pp     | 2 +-
 3 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/lcl/grids.pas b/lcl/grids.pas
index 713cfb2da1..67c0d2b9f3 100644
--- a/lcl/grids.pas
+++ b/lcl/grids.pas
@@ -6622,6 +6622,13 @@ begin
   EditorSetValue;
   if ParentChanged then
     Editor.Parent:=Self;
+  if FEditor=FStringEditor then
+  begin
+    if FCol<Columns.Count then
+      FStringEditor.Alignment:=Columns[FCol].Alignment
+    else
+      FStringEditor.Alignment:=taLeftJustify;
+  end;
   Editor.Visible:=True;
   if Focused and Editor.CanFocus then
     Editor.SetFocus;
diff --git a/lcl/interfaces/gtk2/gtk2wsgrids.pp b/lcl/interfaces/gtk2/gtk2wsgrids.pp
index b74e966c7b..5f41030afe 100644
--- a/lcl/interfaces/gtk2/gtk2wsgrids.pp
+++ b/lcl/interfaces/gtk2/gtk2wsgrids.pp
@@ -53,7 +53,7 @@ var
 begin
   Result:=ACellRect;
   Inc(Result.Left);
-  Dec(Result.Right);
+  Dec(Result.Right, 2);
   Dec(Result.Bottom);
   TextHeight := ACanvas.TextHeight(' ');
   case AColumnLayout of
diff --git a/lcl/interfaces/qt/qtwsgrids.pp b/lcl/interfaces/qt/qtwsgrids.pp
index fd6fe0b88d..deaf0f88d2 100644
--- a/lcl/interfaces/qt/qtwsgrids.pp
+++ b/lcl/interfaces/qt/qtwsgrids.pp
@@ -49,7 +49,7 @@ var
   TextHeight: Integer;
 begin
   Result:=ACellRect;
-  Dec(Result.Right);
+  Inc(Result.Right);
   Dec(Result.Bottom);
   TextHeight := ACanvas.TextHeight(' ');
   case AColumnLayout of