made maximize in form create and focus in show

FRex · Nov 1, 2020 · 80cd5f5 · 80cd5f5
1 parent 62f5fa7
commit 80cd5f5
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 14 deletions.
diff --git a/botes.lpi b/botes.lpi
@@ -90,7 +90,6 @@
     <Linking>
       <Debugging>
         <DebugInfoType Value="dsDwarf2Set"/>
-        <UseHeaptrc Value="True"/>
         <TrashVariables Value="True"/>
         <UseExternalDbgSyms Value="True"/>
       </Debugging>

diff --git a/mainunit.lfm b/mainunit.lfm
@@ -7,11 +7,11 @@ object Form1: TForm1
   ClientHeight = 633
   ClientWidth = 939
   DesignTimePPI = 120
-  OnActivate = FormActivate
   OnClose = FormClose
   OnCloseQuery = FormCloseQuery
   OnCreate = FormCreate
   OnDestroy = FormDestroy
+  OnShow = FormShow
   LCLVersion = '2.0.6.0'
   object MainTabs: TTabControl
     Left = 0

diff --git a/mainunit.pas b/mainunit.pas
@@ -44,11 +44,11 @@   TForm1 = class(TForm)
     procedure BeginFindActionExecute(Sender: TObject);
     procedure CloseTabActionExecute(Sender: TObject);
     procedure DeselectSuggestionsTimerTimer(Sender: TObject);
-    procedure FormActivate(Sender: TObject);
     procedure FormClose(Sender: TObject; var CloseAction: TCloseAction);
     procedure FormCloseQuery(Sender: TObject; var CanClose: boolean);
     procedure FormCreate(Sender: TObject);
     procedure FormDestroy(Sender: TObject);
+    procedure FormShow(Sender: TObject);
     procedure MainTabsChange(Sender: TObject);
     procedure MainTabsChanging(Sender: TObject; var AllowChange: boolean);
     procedure MoveTabBackwardActionExecute(Sender: TObject);
@@ -215,6 +215,8 @@ procedure TForm1.FormCreate(Sender: TObject);
   allnotespath: string;
   notespanelstr: string;
 begin
+  WindowState := wsMaximized;
+
   FAllLines := TStringList.Create;
   FAllLines.LineBreak := #10;
   FDiscardedLines := TStringList.Create;
@@ -285,6 +287,15 @@ procedure TForm1.FormDestroy(Sender: TObject);
   FAllTags.Free;
 end;
 
+procedure TForm1.FormShow(Sender: TObject);
+begin
+  //set focus to text if there is a tag query or to awesome bar if there isnt
+  if Length(MainTabs.Tabs[MainTabs.TabIndex]) = 0 then
+    AwesomeBar.SetFocus
+  else
+    TextEditor.SetFocus;
+end;
+
 procedure TForm1.MainTabsChange(Sender: TObject);
 begin
   AwesomeBar.Text := MainTabs.Tabs[MainTabs.TabIndex];
@@ -705,17 +716,6 @@ procedure TForm1.DeselectSuggestionsTimerTimer(Sender: TObject);
   DeselectSuggestionsTimer.Enabled := False;
 end;
 
-procedure TForm1.FormActivate(Sender: TObject);
-begin
-  WindowState := wsMaximized;
-
-  //set focus to text if there is a tag query or to awesome bar if there isnt
-  if Length(MainTabs.Tabs[MainTabs.TabIndex]) = 0 then
-    AwesomeBar.SetFocus
-  else
-    TextEditor.SetFocus;
-end;
-
 procedure TForm1.FormClose(Sender: TObject; var CloseAction: TCloseAction);
 var
   strs: TStringList;