Changeset 293 for trunk/Settings.pas

Timestamp:

Mar 5, 2021, 1:36:47 PM (3 years ago)

Author:

chronos

Message:

• Fixed: Apply settings from settings dialog only after Ok button click.
• Fixed: Improved full screen mode switching. F11 key can be used in game client form.

File:

• trunk/Settings.pas (modified) (4 diffs)

trunk/Settings.pas

@@ -42 +42 @@
   public
     Languages: TLanguages;
+    procedure LoadData;
+    procedure SaveData;
   end;
 
@@ -105 +107 @@
 
   ButtonFullscreen.Graphic := GrExt[HGrSystem].Data;
-  if FullScreen then ButtonFullscreen.ButtonIndex := 3
-    else ButtonFullscreen.ButtonIndex := 2;
 end;
 
@@ -116 +116 @@
 procedure TSettingsDlg.ButtonFullscreenClick(Sender: TObject);
 begin
-  FullScreen := not FullScreen;
   ButtonFullscreen.ButtonIndex := ButtonFullscreen.ButtonIndex xor 1;
 end;
@@ -151 +150 @@
 begin
   Languages.LoadToStrings(List.Items);
-  List.ItemIndex := Languages.Search(LocaleCode);
-  if (List.ItemIndex = -1) and (Languages.Count > 0) then
-    List.ItemIndex := 0;
   List.Font.Color := MainTexture.clMark;
+  LoadData;
 end;
 
 procedure TSettingsDlg.OKBtnClick(Sender: TObject);
 begin
+  SaveData;
+  ModalResult := mrOk;
+end;
+
+procedure TSettingsDlg.LoadData;
+begin
+  List.ItemIndex := Languages.Search(LocaleCode);
+  if (List.ItemIndex = -1) and (Languages.Count > 0) then
+    List.ItemIndex := 0;
+  if FullScreen then ButtonFullscreen.ButtonIndex := 3
+    else ButtonFullscreen.ButtonIndex := 2;
+end;
+
+procedure TSettingsDlg.SaveData;
+begin
   LocaleCode := Languages[List.ItemIndex].ShortName;
-  ModalResult := mrOk;
+  FullScreen := (ButtonFullscreen.ButtonIndex and 1) = 1;
 end;