From 7093bf2322ed3655ebb019f8eebd3ce3de0d7b8f Mon Sep 17 00:00:00 2001
From: Ansgar Becker <anse@heidisql.com>
Date: Mon, 24 Dec 2018 14:14:35 +0100
Subject: [PATCH] Fix wrong width/height of trigger body editor in high-dpi
 mode. Closes #420

---
 source/trigger_editor.dfm | 134 ++++++++++++++++++++++----------------
 source/trigger_editor.pas |   4 ++
 2 files changed, 81 insertions(+), 57 deletions(-)

diff --git a/source/trigger_editor.dfm b/source/trigger_editor.dfm
index 23e5d6cf..b2522482 100644
--- a/source/trigger_editor.dfm
+++ b/source/trigger_editor.dfm
@@ -8,65 +8,13 @@ object frmTriggerEditor: TfrmTriggerEditor
     700
     500)
   object lblBody: TLabel
+    AlignWithMargins = True
     Left = 3
     Top = 141
-    Width = 327
-    Height = 13
-    Caption = 'Trigger statement: (e.g. "SET NEW.columnA = TRIM(OLD.columnA)"'
-  end
-  object SynMemoBody: TSynMemo
-    Left = 3
-    Top = 160
     Width = 694
-    Height = 306
-    SingleLineMode = False
-    Anchors = [akLeft, akTop, akRight, akBottom]
-    Font.Charset = DEFAULT_CHARSET
-    Font.Color = clWindowText
-    Font.Height = -13
-    Font.Name = 'Courier New'
-    Font.Style = []
-    TabOrder = 0
-    Gutter.Font.Charset = DEFAULT_CHARSET
-    Gutter.Font.Color = clWindowText
-    Gutter.Font.Height = -11
-    Gutter.Font.Name = 'Courier New'
-    Gutter.Font.Style = []
-    Lines.Strings = (
-      'SynMemoBody')
-    OnChange = Modification
-    FontSmoothing = fsmNone
-  end
-  object btnHelp: TButton
-    Left = 3
-    Top = 472
-    Width = 75
-    Height = 25
-    Anchors = [akLeft, akBottom]
-    Caption = 'Help'
-    TabOrder = 1
-    OnClick = btnHelpClick
-  end
-  object btnDiscard: TButton
-    Left = 84
-    Top = 472
-    Width = 75
-    Height = 25
-    Anchors = [akLeft, akBottom]
-    Caption = 'Discard'
-    TabOrder = 2
-    OnClick = btnDiscardClick
-  end
-  object btnSave: TButton
-    Left = 165
-    Top = 472
-    Width = 75
-    Height = 25
-    Anchors = [akLeft, akBottom]
-    Caption = 'Save'
-    Default = True
-    TabOrder = 3
-    OnClick = btnSaveClick
+    Height = 13
+    Align = alTop
+    Caption = 'Trigger statement: (e.g. "SET NEW.columnA = TRIM(OLD.columnA)"'
   end
   object PageControlMain: TPageControl
     AlignWithMargins = True
@@ -169,7 +117,7 @@ object frmTriggerEditor: TfrmTriggerEditor
       object SynMemoCreateCode: TSynMemo
         Left = 0
         Top = 0
-        Width = 463
+        Width = 686
         Height = 103
         SingleLineMode = False
         Align = alClient
@@ -179,6 +127,14 @@ object frmTriggerEditor: TfrmTriggerEditor
         Font.Name = 'Courier New'
         Font.Style = []
         TabOrder = 0
+        CodeFolding.GutterShapeSize = 11
+        CodeFolding.CollapsedLineColor = clGrayText
+        CodeFolding.FolderBarLinesColor = clGrayText
+        CodeFolding.IndentGuidesColor = clGray
+        CodeFolding.IndentGuides = True
+        CodeFolding.ShowCollapsedLine = False
+        CodeFolding.ShowHintMark = True
+        UseCodeFolding = False
         Gutter.AutoSize = True
         Gutter.Font.Charset = DEFAULT_CHARSET
         Gutter.Font.Color = clWindowText
@@ -196,6 +152,70 @@ object frmTriggerEditor: TfrmTriggerEditor
       end
     end
   end
+  object SynMemoBody: TSynMemo
+    AlignWithMargins = True
+    Left = 3
+    Top = 160
+    Width = 694
+    Height = 308
+    Margins.Bottom = 32
+    SingleLineMode = False
+    Align = alClient
+    Font.Charset = DEFAULT_CHARSET
+    Font.Color = clWindowText
+    Font.Height = -13
+    Font.Name = 'Courier New'
+    Font.Style = []
+    TabOrder = 0
+    CodeFolding.GutterShapeSize = 11
+    CodeFolding.CollapsedLineColor = clGrayText
+    CodeFolding.FolderBarLinesColor = clGrayText
+    CodeFolding.IndentGuidesColor = clGray
+    CodeFolding.IndentGuides = True
+    CodeFolding.ShowCollapsedLine = False
+    CodeFolding.ShowHintMark = True
+    UseCodeFolding = False
+    Gutter.Font.Charset = DEFAULT_CHARSET
+    Gutter.Font.Color = clWindowText
+    Gutter.Font.Height = -11
+    Gutter.Font.Name = 'Courier New'
+    Gutter.Font.Style = []
+    Lines.Strings = (
+      'SynMemoBody')
+    OnChange = Modification
+    FontSmoothing = fsmNone
+  end
+  object btnHelp: TButton
+    Left = 3
+    Top = 472
+    Width = 75
+    Height = 25
+    Anchors = [akLeft, akBottom]
+    Caption = 'Help'
+    TabOrder = 1
+    OnClick = btnHelpClick
+  end
+  object btnDiscard: TButton
+    Left = 84
+    Top = 472
+    Width = 75
+    Height = 25
+    Anchors = [akLeft, akBottom]
+    Caption = 'Discard'
+    TabOrder = 2
+    OnClick = btnDiscardClick
+  end
+  object btnSave: TButton
+    Left = 165
+    Top = 472
+    Width = 75
+    Height = 25
+    Anchors = [akLeft, akBottom]
+    Caption = 'Save'
+    Default = True
+    TabOrder = 3
+    OnClick = btnSaveClick
+  end
   object SynCompletionProposalStatement: TSynCompletionProposal
     Options = [scoLimitToMatchedText, scoUseInsertList, scoUsePrettyText, scoEndCharCompletion, scoCompleteWithTab, scoCompleteWithEnter]
     EndOfTokenChr = '()[]. '
diff --git a/source/trigger_editor.pas b/source/trigger_editor.pas
index 7ed7b224..229b5649 100644
--- a/source/trigger_editor.pas
+++ b/source/trigger_editor.pas
@@ -163,6 +163,10 @@ begin
       end;
     end;
   end;
+  // Buttons are randomly moved, since VirtualTree update, see #440
+  btnSave.Top := Height - btnSave.Height - Round(3 * DpiScaleFactor(MainForm));
+  btnHelp.Top := btnSave.Top;
+  btnDiscard.Top := btnSave.Top;
   Modification(Self);
   Modified := False;
   btnSave.Enabled := Modified;