Changeset 193 for branches/highdpi/LocalPlayer

Timestamp:

May 7, 2020, 7:05:57 PM (4 years ago)

Author:

chronos

Message:

• Modified: Improved code in HighDPI branch.

Location:

branches/highdpi/LocalPlayer

Files:

• Battle.pas (modified) (1 diff)
• CityScreen.pas (modified) (1 diff)
• Diagram.pas (modified) (1 diff)
• Draft.pas (modified) (1 diff)
• Help.lfm (modified) (5 diffs)
• Help.pas (modified) (3 diffs)
• MessgEx.pas (modified) (1 diff)
• Rates.pas (modified) (1 diff)
• Select.pas (modified) (1 diff)
• TechTree.pas (modified) (1 diff)
• Term.pas (modified) (5 diffs)
• UnitStat.pas (modified) (2 diffs)

branches/highdpi/LocalPlayer/Battle.pas

@@ -212 +212 @@
     OKBtn.Visible := true;
     CancelBtn.Visible := true;
-    Left := (Screen.Width - ClientWidth) div 2; // center on screen
-    Top := (Screen.Height - ClientHeight) div 2;
+    Left := (DpiScreen.Width - ClientWidth) div 2; // center on screen
+    Top := (DpiScreen.Height - ClientHeight) div 2;
   end
   else

branches/highdpi/LocalPlayer/CityScreen.pas

@@ -1106 +1106 @@
   if WindowMode = wmModal then
   begin { center on screen }
-    Left := (Screen.Width - Width) div 2;
-    Top := (Screen.Height - Height) div 2;
+    Left := (DpiScreen.Width - Width) div 2;
+    Top := (DpiScreen.Height - Height) div 2;
   end;
 

branches/highdpi/LocalPlayer/Diagram.pas

@@ -293 +293 @@
   if WindowMode = wmModal then
   begin { center on screen }
-    Left := (Screen.Width - Width) div 2;
-    Top := (Screen.Height - Height) div 2;
+    Left := (DpiScreen.Width - Width) div 2;
+    Top := (DpiScreen.Height - Height) div 2;
   end;
   OffscreenPaint;

branches/highdpi/LocalPlayer/Draft.pas

@@ -488 +488 @@
   if WindowMode = wmModal then
   begin { center on screen }
-    Left := (Screen.Width - Template.Width) div 2;
-    Top := (Screen.Height - (Template.Height - Cut)) div 2;
+    Left := (DpiScreen.Width - Template.Width) div 2;
+    Top := (DpiScreen.Height - (Template.Height - Cut)) div 2;
   end;
 

branches/highdpi/LocalPlayer/Help.lfm

@@ -1 +1 @@
 object HelpDlg: THelpDlg
   Left = 394
+  Height = 718
   Top = 180
+  Width = 840
   BorderIcons = []
   BorderStyle = bsNone
-  ClientHeight = 479
-  ClientWidth = 560
+  ClientHeight = 718
+  ClientWidth = 840
   Color = clBtnFace
-  Font.Charset = DEFAULT_CHARSET
+  DesignTimePPI = 144
   Font.Color = clWindowText
-  Font.Height = -13
+  Font.Height = -20
   Font.Name = 'MS Sans Serif'
-  Font.Style = []
   FormStyle = fsStayOnTop
   OnClose = FormClose
@@ -17 +18 @@
   OnDestroy = FormDestroy
   OnKeyDown = FormKeyDown
-  OnMouseWheel = FormMouseWheel
   OnMouseDown = PaintBox1MouseDown
   OnMouseMove = PaintBox1MouseMove
+  OnMouseWheel = FormMouseWheel
   OnPaint = FormPaint
-  PixelsPerInch = 96
+  LCLVersion = '2.0.8.0'
   object CloseBtn: TButtonB
-    Left = 522
-    Top = 6
-    Width = 25
-    Height = 25
+    Left = 783
+    Height = 38
+    Top = 9
+    Width = 38
     Down = False
     Permanent = False
@@ -33 +34 @@
   end
   object BackBtn: TButtonB
-    Left = 42
-    Top = 6
-    Width = 25
-    Height = 25
+    Left = 63
+    Height = 38
+    Top = 9
+    Width = 38
     Down = False
     Permanent = False
@@ -43 +44 @@
   end
   object TopBtn: TButtonB
-    Left = 13
-    Top = 6
-    Width = 25
-    Height = 25
+    Left = 20
+    Height = 38
+    Top = 9
+    Width = 38
     Down = False
     Permanent = False
@@ -53 +54 @@
   end
   object SearchBtn: TButtonB
-    Left = 493
-    Top = 6
-    Width = 25
-    Height = 25
+    Left = 740
+    Height = 38
+    Top = 9
+    Width = 38
     Down = False
     Permanent = False

branches/highdpi/LocalPlayer/Help.pas

@@ -367 +367 @@
   ImpPtr: array [-1 .. 1] of TPixelPointer;
 begin
+  { TODO
   // assume eiffel tower has free common heaven
   for dy := 0 to nHeaven - 1 do
@@ -376 +377 @@
   xSrc := iix mod 7 * xSizeBig;
   ySrc := (iix div 7 + 1) * ySizeBig;
-  for y := 0 to ySizeBig * 2 - 1 do
+  for y := 0 to ScaleToVcl(ySizeBig * 2) - 1 do
     if ((y0 + y) >= 0) and ((y0 + y) < InnerHeight) then begin
-      PaintPtr.Init(OffScreen, 0, y0 + y);
-      CoalPtr.Init(Templates, 0, yCoal + y);
+      PaintPtr.Init(OffScreen, 0, ScaleToVcl(y0 + y));
+      CoalPtr.Init(Templates, 0, ScaleToVcl(yCoal + y));
       for dy := -1 to 1 do
         if ((Max(y + dy, 0) shr 1) >= 0) and ((Max(y + dy, 0) shr 1) < ySizeBig) then
-          ImpPtr[dy].Init(BigImp, 0, ySrc + (Max(y + dy, 0) shr 1));
-      for x := 0 to xSizeBig * 2 - 1 do begin
+          ImpPtr[dy].Init(BigImp, 0, ScaleToVcl(ySrc + (Max(y + dy, 0) shr 1)));
+      for x := 0 to ScaleToVcl(xSizeBig * 2) - 1 do begin
         sum := 0;
         for dx := -1 to 1 do begin
@@ -412 +413 @@
   Offscreen.EndUpdate;
   BigImp.EndUpdate;
+  }
 end;
 

branches/highdpi/LocalPlayer/MessgEx.pas

@@ -177 +177 @@
     0:
       begin
-        Left := (Screen.Width - ClientWidth) div 2;
-        Top := (Screen.Height - ClientHeight) div 2 - MapCenterUp;
+        Left := (DpiScreen.Width - ClientWidth) div 2;
+        Top := (DpiScreen.Height - ClientHeight) div 2 - MapCenterUp;
       end;
     1:
       begin
-        Left := (Screen.Width - ClientWidth) div 4;
-        Top := (Screen.Height - ClientHeight) * 2 div 3 - MapCenterUp;
+        Left := (DpiScreen.Width - ClientWidth) div 4;
+        Top := (DpiScreen.Height - ClientHeight) * 2 div 3 - MapCenterUp;
       end;
     -1:
       begin
-        Left := (Screen.Width - ClientWidth) div 4;
-        Top := (Screen.Height - ClientHeight) div 3 - MapCenterUp;
+        Left := (DpiScreen.Width - ClientWidth) div 4;
+        Top := (DpiScreen.Height - ClientHeight) div 3 - MapCenterUp;
       end;
   end;

branches/highdpi/LocalPlayer/Rates.pas

@@ -42 +42 @@
 procedure TRatesDlg.FormCreate(Sender: TObject);
 begin
-  TitleHeight := Screen.Height;
+  TitleHeight := DpiScreen.Height;
   InitButtons();
 end;

branches/highdpi/LocalPlayer/Select.pas

@@ -1609 +1609 @@
   begin { center on screen }
     if Kind = kTribe then
-      Left := (Screen.Width - 800) * 3 div 8 + 130
+      Left := (DpiScreen.Width - 800) * 3 div 8 + 130
     else
-      Left := (Screen.Width - Width) div 2;
-    Top := (Screen.Height - Height) div 2;
+      Left := (DpiScreen.Width - Width) div 2;
+    Top := (DpiScreen.Height - Height) div 2;
     if Kind = kProject then
       Top := Top + 48;

branches/highdpi/LocalPlayer/TechTree.pas

@@ -183 +183 @@
 
   // fit window to image, center image in window, center window to screen
-  width := min(Screen.width - 40, Image.width + LeftBorder + RightBorder + 2 *
+  width := min(DpiScreen.width - 40, Image.width + LeftBorder + RightBorder + 2 *
     BlackBorder);
-  height := min(Screen.height - 40, Image.height + TopBorder + BottomBorder + 2
+  height := min(DpiScreen.height - 40, Image.height + TopBorder + BottomBorder + 2
     * BlackBorder);
-  Left := (Screen.width - width) div 2;
-  Top := (Screen.height - height) div 2;
+  Left := (DpiScreen.width - width) div 2;
+  Top := (DpiScreen.height - height) div 2;
   CloseBtn.Left := width - CloseBtn.width - BlackBorder - 8;
   CloseBtn.Top := BlackBorder + 8;

branches/highdpi/LocalPlayer/Term.pas

@@ -2503 +2503 @@
           SetMainTextureByAge(-1);
         Tribes.Init;
-        HelpDlg.UserLeft := (Screen.width - HelpDlg.width) div 2;
-        HelpDlg.UserTop := (Screen.height - HelpDlg.height) div 2;
+        HelpDlg.UserLeft := (DpiScreen.width - HelpDlg.width) div 2;
+        HelpDlg.UserTop := (DpiScreen.height - HelpDlg.height) div 2;
         HelpDlg.Difficulty := 0;
         if Command = cStartCredits then
@@ -2566 +2566 @@
         ListDlg.UserLeft := 8;
         ListDlg.UserTop := TopBarHeight + 8;
-        HelpDlg.UserLeft := Screen.width - HelpDlg.width - 8;
+        HelpDlg.UserLeft := DpiScreen.width - HelpDlg.width - 8;
         HelpDlg.UserTop := TopBarHeight + 8;
         UnitStatDlg.UserLeft := 397;
         UnitStatDlg.UserTop := TopBarHeight + 64;
-        DiaDlg.UserLeft := (Screen.width - DiaDlg.width) div 2;
-        DiaDlg.UserTop := (Screen.height - DiaDlg.height) div 2;
-        NatStatDlg.UserLeft := Screen.width - NatStatDlg.width - 8;
-        NatStatDlg.UserTop := Screen.height - PanelHeight -
+        DiaDlg.UserLeft := (DpiScreen.width - DiaDlg.width) div 2;
+        DiaDlg.UserTop := (DpiScreen.height - DiaDlg.height) div 2;
+        NatStatDlg.UserLeft := DpiScreen.width - NatStatDlg.width - 8;
+        NatStatDlg.UserTop := DpiScreen.height - PanelHeight -
           NatStatDlg.height - 8;
         if NatStatDlg.UserTop < 8 then
@@ -3908 +3908 @@
       UnitStatDlg.Close;
   end;
-  for i := 0 to Screen.FormCount - 1 do
+  for i := 0 to DpiScreen.FormCount - 1 do
     if DpiScreen.Forms[i].Visible and (DpiScreen.Forms[i] is TBufferedDrawDlg) then
       DpiScreen.Forms[i].Enabled := false;
@@ -5102 +5102 @@
         dx := 0;
         dy := 0;
-        if Mouse.CursorPos.y < Screen.height - PanelHeight then
+        if Mouse.CursorPos.y < DpiScreen.height - PanelHeight then
           if Mouse.CursorPos.x = 0 then
             dx := -speed // scroll left
-          else if Mouse.CursorPos.x = Screen.width - 1 then
+          else if Mouse.CursorPos.x = DpiScreen.width - 1 then
             dx := speed; // scroll right
         if Mouse.CursorPos.y = 0 then
           dy := -speed // scroll up
-        else if (Mouse.CursorPos.y = Screen.height - 1) and
+        else if (Mouse.CursorPos.y = DpiScreen.height - 1) and
           (Mouse.CursorPos.x >= TerrainBtn.Left + TerrainBtn.width) and
           (Mouse.CursorPos.x < xRightPanel + 10 - 8) then
@@ -5469 +5469 @@
       if BattleDlg.Left < 0 then
         BattleDlg.Left := 0
-      else if BattleDlg.Left + BattleDlg.width > Screen.width then
-        BattleDlg.Left := Screen.width - BattleDlg.width;
+      else if BattleDlg.Left + BattleDlg.width > DpiScreen.width then
+        BattleDlg.Left := DpiScreen.width - BattleDlg.width;
       BattleDlg.Top := y - BattleDlg.height div 2;
       if BattleDlg.Top < 0 then
         BattleDlg.Top := 0
-      else if BattleDlg.Top + BattleDlg.height > Screen.height then
-        BattleDlg.Top := Screen.height - BattleDlg.height;
+      else if BattleDlg.Top + BattleDlg.height > DpiScreen.height then
+        BattleDlg.Top := DpiScreen.height - BattleDlg.height;
       BattleDlg.IsSuicideQuery := false;
       BattleDlg.Show;

branches/highdpi/LocalPlayer/UnitStat.pas

@@ -74 +74 @@
   inherited;
   AgePrepared := -2;
-  TitleHeight := Screen.Height;
+  TitleHeight := DpiScreen.Height;
   InitButtons();
 
@@ -171 +171 @@
   else
   begin
-    Left := (Screen.Width - Width) div 2;
-    Top := (Screen.Height - Height) div 2;
+    Left := (DpiScreen.Width - Width) div 2;
+    Top := (DpiScreen.Height - Height) div 2;
   end;