fix: form dimensions reset to default values each time, and wrong check for empty SynEdit

ansgarbecker · ansgarbecker · commit dab1cda93e0a · 2026-01-17T10:38:36.000+01:00
This disables the AutoSize property on most forms (except the about dialog).
diff --git a/source/column_selection.lfm b/source/column_selection.lfm
@@ -3,7 +3,6 @@ object frmColumnSelection: TfrmColumnSelection
   Height = 304
   Top = 0
   Width = 250
-  AutoSize = True
   BorderStyle = bsSizeToolWin
   Caption = 'Select columns'
   ClientHeight = 304
diff --git a/source/copytable.lfm b/source/copytable.lfm
@@ -3,7 +3,6 @@ object CopyTableForm: TCopyTableForm
   Height = 380
   Top = 115
   Width = 455
-  AutoSize = True
   Caption = 'Copy Table...'
   ClientHeight = 380
   ClientWidth = 455
diff --git a/source/copytable.pas b/source/copytable.pas
@@ -72,6 +72,8 @@ implementation
 
 procedure TCopyTableForm.FormCreate(Sender: TObject);
 begin
+  Width := AppSettings.ReadInt(asCopyTableWindowWidth);
+  Height := AppSettings.ReadInt(asCopyTableWindowHeight);
   MainForm.SetupSynEditors(Self);
   FixVT(TreeElements);
 end;
@@ -86,8 +88,6 @@ procedure TCopyTableForm.FormResize(Sender: TObject);
   // Give both dropdown and edit box the same width. See http://www.heidisql.com/forum.php?t=11039
   HalfWidth := (ClientWidth - (3*Space)) div 2;
   comboDatabase.Width := HalfWidth;
-  editNewTablename.Width := HalfWidth;
-  editNewTablename.Left := comboDatabase.Left + comboDatabase.Width + Space;
 end;
 
 
@@ -99,9 +99,6 @@ procedure TCopyTableForm.FormShow(Sender: TObject);
   Item: TMenuItem;
   Tree: TVirtualStringTree;
 begin
-  // Todo: check if resizing a form here drags its controls with it
-  //Width := AppSettings.ReadIntDpiAware(asCopyTableWindowWidth, Self);
-  //Height := AppSettings.ReadIntDpiAware(asCopyTableWindowHeight, Self);
   if Mainform.DBtree.Focused then
     Tree := Mainform.DBtree
   else
@@ -175,7 +172,7 @@ procedure TCopyTableForm.FormClose(Sender: TObject; var Action: TCloseAction);
     Node := TreeElements.GetNextSibling(Node);
   end;
   // Store recent filters
-  if MemoFilter.Enabled and (MemoFilter.GetTextLen > 0) then begin
+  if MemoFilter.Enabled and (not MemoFilter.TextIsEmpty) then begin
     NewValues := TStringList.Create;
     NewValues.Add(MemoFilter.Text);
     for i:=1 to 20 do begin
@@ -482,7 +479,7 @@ procedure TCopyTableForm.btnOKClick(Sender: TObject);
     DataCols := Trim(DataCols);
     Delete(DataCols, Length(DataCols), 1);
     InsertCode := 'INSERT INTO '+TargetTable+' ('+DataCols+') SELECT ' + DataCols + ' FROM ' + FDBObj.QuotedName;
-    if MemoFilter.GetTextLen > 0 then
+    if not MemoFilter.TextIsEmpty then
       InsertCode := InsertCode + ' WHERE ' + MemoFilter.Text;
   end;
 
diff --git a/source/lazaruscompat.pas b/source/lazaruscompat.pas
@@ -18,6 +18,7 @@ interface
   TSynEditHelper = class helper for TSynEdit
     public
       function GetTextLen: Integer;
+      function TextIsEmpty: Boolean;
       function ConvertCodeStringToCommand(AString: string): TSynEditorCommand;
       function IndexToEditorCommand(const AIndex: Integer): Integer;
   end;
@@ -162,7 +163,13 @@ implementation
 
 function TSynEditHelper.GetTextLen: Integer;
 begin
-  Result := Self.Text.Length;
+  Result := Length(Text);
+end;
+
+function TSynEditHelper.TextIsEmpty: Boolean;
+begin
+  // Introduced because GetTextLen seems to be unreliable, probably due to the lack of Trim()
+  Result := Trim(Text).IsEmpty;
 end;
 
 function TSynEditHelper.ConvertCodeStringToCommand(AString: string): TSynEditorCommand;
diff --git a/source/searchreplace.lfm b/source/searchreplace.lfm
@@ -3,7 +3,6 @@ object frmSearchReplace: TfrmSearchReplace
   Height = 389
   Top = 0
   Width = 542
-  AutoSize = True
   BorderIcons = []
   Caption = 'Search and replace text'
   ClientHeight = 389
