Changeset 194 for trunk/Start.pas

Timestamp:

May 7, 2020, 8:39:24 PM (4 years ago)

Author:

chronos

Message:

• Fixed: Locale configuration in configuration was not working as expected. ModalResult of Ok and Cancel buttons was opposite. Selected locale was not applied during application startup.
• Fixed: Updating fullscreen mode after changeing mode in configuration window.

File:

• trunk/Start.pas (modified) (6 diffs)

trunk/Start.pas

@@ -155 +155 @@
     procedure SaveConfig;
     procedure LoadAiBrainsPictures;
+    procedure UpdateInterface;
   end;
 
@@ -432 +433 @@
 var
   x, i: Integer;
-  r0, r1: HRgn;
-  Location: TPoint;
   PlayerSlot: TPlayerSlot;
   AIBrains: TBrains;
@@ -445 +444 @@
   end;
   LoadConfig;
+  LoadAssets;
 
   ActionsOffered := [maConfig, maManual, maCredits, maWeb];
@@ -467 +467 @@
   DirectDlg.Top := (Screen.Height - DirectDlg.Height) div 2;
 
-  if FullScreen then begin
-    Location := Point((Screen.Width - 800) * 3 div 8,
-      Screen.Height - Height - (Screen.Height - 600) div 3);
-    Left := Location.X;
-    Top := Location.Y;
-
-    r0 := CreateRectRgn(0, 0, Width, Height);
-    r1 := CreateRectRgn(TabOffset + 4 * TabSize + 2, 0, Width, TabHeight);
-    CombineRgn(r0, r0, r1, RGN_DIFF);
-    DeleteObject(r1);
-    r1 := CreateRectRgn(QuitBtn.Left, QuitBtn.Top, QuitBtn.Left + QuitBtn.Width,
-      QuitBtn.top + QuitBtn.Height);
-    CombineRgn(r0, r0, r1, RGN_OR);
-    DeleteObject(r1);
-    SetWindowRgn(Handle, r0, False);
-    DeleteObject(r0); // causes crash with Windows 95
-  end else begin
-    Left := (Screen.Width - Width) div 2;
-    Top := (Screen.Height - Height) div 2;
-  end;
+  UpdateInterface;
 
   Canvas.Font.Assign(UniFont[ftNormal]);
@@ -703 +684 @@
   end;
   AIBrains.Free;
+end;
+
+procedure TStartDlg.UpdateInterface;
+var
+  r0, r1: HRgn;
+  Location: TPoint;
+begin
+  if FullScreen then begin
+    Location := Point((Screen.Width - 800) * 3 div 8,
+      Screen.Height - Height - (Screen.Height - 600) div 3);
+    Left := Location.X;
+    Top := Location.Y;
+
+    r0 := CreateRectRgn(0, 0, Width, Height);
+    r1 := CreateRectRgn(TabOffset + 4 * TabSize + 2, 0, Width, TabHeight);
+    CombineRgn(r0, r0, r1, RGN_DIFF);
+    DeleteObject(r1);
+    r1 := CreateRectRgn(QuitBtn.Left, QuitBtn.Top, QuitBtn.Left + QuitBtn.Width,
+      QuitBtn.top + QuitBtn.Height);
+    CombineRgn(r0, r0, r1, RGN_OR);
+    DeleteObject(r1);
+    SetWindowRgn(Handle, r0, False);
+    DeleteObject(r0); // causes crash with Windows 95
+  end else begin
+    Left := (Screen.Width - Width) div 2;
+    Top := (Screen.Height - Height) div 2;
+  end;
 end;
 
@@ -1636 +1644 @@
           LocaleDlg := TLocaleDlg.Create(nil);
           if LocaleDlg.ShowModal = mrOk then begin
-            LoadPhrases;
+            LoadAssets;
             Invalidate;
+            UpdateInterface;
+            Background.UpdateInterface;
           end;
           FreeAndNil(LocaleDlg);