From cdd3e42006624f3fab8e4dfb30730da2be614e9f Mon Sep 17 00:00:00 2001
From: wp_xxyyzz <wp_xxyyzz@8e941d3f-bd1b-0410-a28a-d453659cc2b4>
Date: Sat, 13 Aug 2016 14:01:04 +0000
Subject: [PATCH] tvplanit: Fix Linux button issue in Element editor, another
 attempt.

git-svn-id: https://svn.code.sf.net/p/lazarus-ccr/svn@5085 8e941d3f-bd1b-0410-a28a-d453659cc2b4
---
 components/tvplanit/source/vpedelem.lfm | 6 +++---
 components/tvplanit/source/vpedelem.pas | 6 ++++++
 2 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/components/tvplanit/source/vpedelem.lfm b/components/tvplanit/source/vpedelem.lfm
index 00eeabe16..41db3b771 100644
--- a/components/tvplanit/source/vpedelem.lfm
+++ b/components/tvplanit/source/vpedelem.lfm
@@ -423,7 +423,6 @@ object frmEditElement: TfrmEditElement
     Top = 403
     Width = 465
     Align = alTop
-    AutoSize = True
     BorderSpacing.Left = 12
     BorderSpacing.Top = 8
     BorderSpacing.Right = 12
@@ -445,12 +444,13 @@ object frmEditElement: TfrmEditElement
     end
     object btnOk: TButton
       AnchorSideRight.Control = btnCancel
-      Left = 309
+      Left = 308
       Height = 25
       Top = 0
       Width = 75
       Anchors = [akTop, akRight]
-      BorderSpacing.Right = 7
+      BorderSpacing.Left = 8
+      BorderSpacing.Right = 8
       Caption = 'OK'
       Default = True
       OnClick = btnOkClick
diff --git a/components/tvplanit/source/vpedelem.pas b/components/tvplanit/source/vpedelem.pas
index 35ce12598..a2016a7ef 100644
--- a/components/tvplanit/source/vpedelem.pas
+++ b/components/tvplanit/source/vpedelem.pas
@@ -329,6 +329,7 @@ begin
   btnCancel.Height := hBtn;
   btnShape.Height := hBtn;
   btnCaptionFont.Height := hBtn;
+  ButtonPanel.Height := btnOK.Top + btnOK.Height + btnOK.Top;
 
   gbDayOffset.Height := rgDayOffsetUnit.Height;
   rgRotation.Height := rgMeasurement.Height;
@@ -362,15 +363,20 @@ begin
   btnCancel.Width := w;
   btnShape.Width := GetButtonWidth(btnShape);
  {$IFDEF MSWINDOWS}
+  btnOK.BorderSpacing.Right := 8;
   btnOK.AnchorSideRight.Control := btnCancel;
   btnOK.TabOrder := 1;
+  btnCancel.BorderSpacing.Left := 0;
   btnCancel.AnchorSideRight.Control := ButtonPanel;
   btnCancel.AnchorSideRight.Side := asrBottom;
   btnCancel.TabOrder := 2;
  {$ELSE}
+  btnOK.BorderSpacing.Right := 0;
+  btnOK.BorderSpacing.Left := 8;
   btnOK.AnchorSideRight.Control := ButtonPanel;
   btnOK.AnchorSideRight.Side := asrBottom;
   btnCancel.AnchorSideRight.Control := btnOK;
+  btnCancel.BorderSpacing.Right := 0;
   btnCancel.TabOrder := 1;
   btnOK.TabOrder := 2;
  {$ENDIF}