Changeset 220

Timestamp:

May 11, 2020, 11:15:35 PM (4 years ago)

Author:

chronos

Message:

• Modified: Use wsFullScreen to switch to fullscreen mode.
• Fixed: Image memory leak in TechTree.

Location:

trunk

Files:

• Back.pas (modified) (1 diff)
• LocalPlayer/TechTree.pas (modified) (5 diffs)
• LocalPlayer/Term.pas (modified) (1 diff)

trunk/Back.pas

@@ -65 +65 @@
 begin
   if FullScreen then begin
-    WindowState := wsMaximized;
+    WindowState := wsFullScreen;
     if not Assigned(Img) then begin
       FileName := GetGraphicsDir + DirectorySeparator + 'Background.png';

trunk/LocalPlayer/TechTree.pas

@@ -9 +9 @@
 
 type
+
+  { TTechTreeDlg }
+
   TTechTreeDlg = class(TDrawDlg)
     CloseBtn: TButtonB;
     procedure FormCreate(Sender: TObject);
+    procedure FormDestroy(Sender: TObject);
     procedure FormPaint(Sender: TObject);
     procedure FormShow(Sender: TObject);
@@ -24 +28 @@
     xOffset, yOffset, xDown, yDown: Integer;
     Image: TBitmap;
-    dragging: boolean;
+    Dragging: Boolean;
   end;
 
@@ -72 +76 @@
   InitButtons;
   Image := nil;
+end;
+
+procedure TTechTreeDlg.FormDestroy(Sender: TObject);
+begin
+  FreeAndNil(Image);
 end;
 
@@ -121 +130 @@
   X, Y, ad: Integer;
   s: string;
+  NewWidth: Integer;
+  NewHeight: Integer;
 const
   TransparentColor = $7F007F;
@@ -164 +175 @@
 
   // fit window to image, center image in window, center window to screen
-  width := min(Screen.width - 40, Image.width + LeftBorder + RightBorder + 2 *
-    BlackBorder);
-  height := min(Screen.height - 40, Image.height + TopBorder + BottomBorder + 2
-    * BlackBorder);
-  Left := (Screen.width - width) div 2;
-  Top := (Screen.height - height) div 2;
+  NewWidth := Min(Screen.Width - 40, Image.Width + LeftBorder + RightBorder + 2 * BlackBorder);
+  NewHeight := Min(Screen.Height - 40, Image.Height + TopBorder + BottomBorder + 2 * BlackBorder);
+  BoundsRect := Bounds((Screen.Width - NewWidth) div 2,
+    (Screen.Height - NewHeight) div 2,
+    NewWidth, NewHeight);
   CloseBtn.Left := width - CloseBtn.width - BlackBorder - 8;
   CloseBtn.Top := BlackBorder + 8;
-  xOffset := (ClientWidth - Image.width + LeftBorder - RightBorder) div 2 -
+  xOffset := (ClientWidth - Image.Width + LeftBorder - RightBorder) div 2 -
     BlackBorder;
-  yOffset := ClientHeight - 2 * BlackBorder - Image.height - BottomBorder;
+  yOffset := ClientHeight - 2 * BlackBorder - Image.Height - BottomBorder;
 end;
 

trunk/LocalPlayer/Term.pas

@@ -7795 +7795 @@
 begin
   if FullScreen then begin
-    WindowState := wsMaximized;
+    WindowState := wsFullScreen;
     BorderStyle := bsNone;
     BorderIcons := [];