Changeset 293 for trunk

Timestamp:

Mar 5, 2021, 1:36:47 PM (4 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.

Location:

trunk

Files:

• LocalPlayer/Term.pas (modified) (13 diffs)
• LocalPlayer/UKeyBindings.pas (modified) (2 diffs)
• Settings.pas (modified) (4 diffs)

trunk/LocalPlayer/Term.pas

@@ -235 +235 @@
     Closable, RepaintOnResize, Tracking, TurnComplete, Edited, GoOnPhase,
       HaveStrategyAdvice, FirstMovieTurn: boolean;
+    PrevWindowState: TWindowState;
+    CurrentWindowState: TWindowState;
     function ChooseUnusedTribe: integer;
     procedure GetTribeList;
@@ -284 +286 @@
     procedure SoundPreload(Check: integer);
     procedure UpdateKeyShortcuts;
+    procedure SetFullScreen(Active: Boolean);
   public
     UsedOffscreenWidth, UsedOffscreenHeight: integer;
@@ -308 +311 @@
     FileName: ShortString;
   end;
-
   TCityNameInfo = record
     ID: integer;
-    NewName: ShortString end;
-    TModelNameInfo = record mix: integer;
-    NewName: ShortString end;
-    TPriceSet = Set of $00 .. $FF;
+    NewName: ShortString;
+  end;
+  TModelNameInfo = record
+    mix: integer;
+    NewName: ShortString;
+  end;
+  TPriceSet = Set of $00 .. $FF;
 
 const
@@ -532 +537 @@
   SmallScreen, GameOK, MapValid, skipped, idle: boolean;
 
-  SaveOption: array [0 .. nSaveOption - 1] of integer;
-  MiniColors: array [0 .. 11, 0 .. 1] of TColor;
+  SaveOption: array [0..nSaveOption - 1] of integer;
+  MiniColors: array [0..11, 0..1] of TColor;
   MainMap: TIsoMap;
   CurrentMoveInfo: record AfterMovePaintRadius, AfterAttackExpeller: integer;
@@ -737 +742 @@
     ChooseModelPicture(Owner, mix, ModelCode(MyRO.EnemyModel[emix]),
       ModelHash(MyRO.EnemyModel[emix]), MyRO.Turn, false, true);
-  result := true
+  result := true;
 end;
 
@@ -874 +879 @@
             MyModel[mix].Status := MyModel[mix].Status or msObsolete;
       end;
-      inc(MyData.ToldModels)
+      inc(MyData.ToldModels);
     end;
 end;
@@ -3612 +3617 @@
     RectInvalidate(0, TopBarHeight, ClientWidth, TopBarHeight + MapHeight);
     MapValid := false;
-    PaintAll
-  end
+    PaintAll;
+  end;
 end;
 
@@ -4058 +4063 @@
 var
   uix, cix, x, y, Loc, i, hw, xm, cm, cmPolOcean, cmPolNone: integer;
-  PrevMiniPixel, MiniPixel: TPixelPointer;
+  PrevMiniPixel: TPixelPointer;
+  MiniPixel: TPixelPointer;
+  TerrainTile: Cardinal;
 begin
   cmPolOcean := GrExt[HGrSystem].Data.Canvas.Pixels[101, 67];
@@ -4082 +4089 @@
             ScaleToNative(G.lx) * 5) mod (ScaleToNative(G.lx) * 2);
           MiniPixel.SetXY(xm, y);
-          cm := MiniColors[MyMap[Loc] and fTerrain, i];
+          TerrainTile := MyMap[Loc] and fTerrain;
+          if TerrainTile > 11 then TerrainTile := 0;
+          cm := MiniColors[TerrainTile, i];
           if ClientMode = cEditMap then
           begin
@@ -4572 +4581 @@
       Brush.Style := bsClear;
       if UnFocus >= 0 then
-        with MyUn[UnFocus], MyModel[mix] do
+        with MyUn[UnFocus] do
+        with MyModel[mix] do
         begin { display info about selected unit }
           if Job = jCity then
@@ -6492 +6502 @@
 end;
 
+procedure TMainScreen.SetFullScreen(Active: Boolean);
+begin
+  (*  if FullScreen then begin
+      ShowWindow(Handle, SW_SHOWFULLSCREEN);
+      {$IFDEF WINDOWS}
+      Form.BorderStyle := bsNone;
+      {$ENDIF}
+    end else begin
+      {$IFDEF WINDOWS}
+      Form.BorderStyle := bsSizeable;
+      {$ENDIF}
+      ShowWindow(Handle, SW_SHOWNORMAL);
+      WindowState := wsMaximized;
+      BorderStyle := bsSizeable;
+      BorderIcons := [biSystemMenu, biMinimize, biMaximize];
+    end;
+   *)
+    if Active and (CurrentWindowState <> wsFullScreen) then begin
+      PrevWindowState := WindowState;
+      CurrentWindowState := wsFullScreen;
+      WindowState := CurrentWindowState;
+      {$IFDEF WINDOWS}
+      BorderStyle := bsNone;
+      {$ENDIF}
+      BorderIcons := [];
+    end else
+    if not Active and (CurrentWindowState = wsFullScreen) then begin
+      if PrevWindowState = wsMaximized then begin
+        CurrentWindowState := wsMaximized;
+        WindowState := CurrentWindowState;
+      end else begin
+        CurrentWindowState := wsNormal;
+        WindowState := CurrentWindowState;
+        WindowState := wsFullScreen;
+        WindowState := CurrentWindowState;
+      end;
+      {$IFDEF WINDOWS}
+      BorderStyle := bsSizeable;
+      {$ENDIF}
+      BorderIcons := [biSystemMenu, biMinimize, biMaximize];
+    end;
+end;
+
 procedure TMainScreen.FormKeyDown(Sender: TObject; var Key: word;
   Shift: TShiftState);
@@ -6558 +6611 @@
 
   if BEndTurn.Test(ShortCut) then EndTurn
+  else if BFullScreen.Test(ShortCut) then begin
+    FullScreen := not FullScreen;
+    SetFullScreen(FullScreen);
+  end
   else if BHelp.Test(ShortCut) then MenuClick(mHelp)
   else if BUnitStat.Test(ShortCut) then MenuClick_Check(StatPopup, mUnitStat)
@@ -7758 +7815 @@
 procedure TMainScreen.FormShow(Sender: TObject);
 begin
-  if FullScreen then begin
-    WindowState := wsFullScreen;
-    BorderStyle := bsNone;
-    BorderIcons := [];
-  end else begin
-    WindowState := wsMaximized;
-    BorderStyle := bsSizeable;
-    BorderIcons := [biSystemMenu, biMinimize, biMaximize];
-  end;
+  SetFullScreen(FullScreen);
   Timer1.Enabled := True;
 end;

trunk/LocalPlayer/UKeyBindings.pas

@@ -44 +44 @@
   BNations: TKeyBinding;
   BEmpire: TKeyBinding;
+  BFullScreen: TKeyBinding;
   BResign: TKeyBinding;
   BRandomMap: TKeyBinding;
@@ -222 +223 @@
   BNations := AddItem('Nations', 'Nations', 'F9');
   BEmpire := AddItem('Empire', 'Empire', 'F10');
+  BFullScreen := AddItem('FullScreen', 'Full screen', 'F11');
   BResign := AddItem('Resign', 'Resign', 'Ctrl+Q');
   BRandomMap := AddItem('RandomMap', 'Random map', 'Ctrl+R');

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;