Changeset 265 for branches/highdpi/LocalPlayer/Term.pas

Timestamp:

Jun 25, 2020, 10:24:44 PM (4 years ago)

Author:

chronos

Message:

• Fixed: Scaling IsoEngine ForgOfWar sprites.
• Fixed: PopupMenu position calculated using not scaled GetSystemMetrics.
• Fixed: Scale TDpiBitmaps using normal scaling functions to get pixels on valid expected possition.
• Fixed: DpiBitBlt needs to be executed as StretchDraw for non-integer pixel scaling. This leads to slower drawing.

File:

• branches/highdpi/LocalPlayer/Term.pas (modified) (10 diffs)

branches/highdpi/LocalPlayer/Term.pas

@@ -563 +563 @@
   nx := BigImp.Width div xSizeBig * xSizeSmall;
   ny := BigImp.Height div ySizeBig * ySizeSmall;
+  SmallImp.SetSize(nx, ny);
+  SmallImp.Canvas.StretchDraw(Rect(0, 0, SmallImp.Width, SmallImp.Height), BigImp);
+
+{  nx := BigImp.Width div xSizeBig * xSizeSmall;
+  ny := BigImp.Height div ySizeBig * ySizeSmall;
 
   // resample icons
@@ -636 +641 @@
   SmallImp.EndUpdate;
   FreeMem(Resampled);
+  }
 end;
 
@@ -3583 +3589 @@
   sb.SetBorderSpacing(ClientHeight - yTroop - 24, ClientWidth - xRightPanel + 8, 8);
   {TODO:
-  SetWindowPos(sb.ScrollBar.Handle, 0, xRightPanel + 10 - 14 - GetSystemMetrics(SM_CXVSCROLL),
+  SetWindowPos(sb.ScrollBar.Handle, 0, xRightPanel + 10 - 14 - DpiGetSystemMetrics(SM_CXVSCROLL),
     ClientHeight - MidPanelHeight + 8, 0, 0, SWP_NOSIZE or SWP_NOZORDER);
     }
@@ -3669 +3675 @@
     if SmallScreen and not supervising then
       xTroop := xRightPanel + 10 - 3 * 66 -
-        GetSystemMetrics(SM_CXVSCROLL) - 19 - 4;
+        DpiGetSystemMetrics(SM_CXVSCROLL) - 19 - 4;
     // not perfect but we assume almost no one is still playing on a 800x600 screen
   end;
-  TrRow := (xRightPanel + 10 - xTroop - GetSystemMetrics(SM_CXVSCROLL) - 19)
+  TrRow := (xRightPanel + 10 - xTroop - DpiGetSystemMetrics(SM_CXVSCROLL) - 19)
     div TrPitch;
 end;
@@ -5330 +5336 @@
       else
         EditPopup.Popup(Left + x + 4,
-          Top + y + GetSystemMetrics(SM_CYCAPTION) + 4);
+          Top + y + DpiGetSystemMetrics(SM_CYCAPTION) + 4);
     end
     else if (UnFocus >= 0) and (MyUn[UnFocus].Loc <> MouseLoc) then
@@ -6214 +6220 @@
         StatPopup.Popup(Left + ClientWidth - xPalace + 6,
           Top + ClientHeight - PanelHeight + yPalace + ySizeBig +
-          GetSystemMetrics(SM_CYCAPTION) + 3)
+          DpiGetSystemMetrics(SM_CYCAPTION) + 3)
     end
     (* else if (x>=xAdvisor-3) and (y>=yAdvisor-3)
@@ -6306 +6312 @@
 begin
   TroopLoc := Loc;
-  TrRow := (xRightPanel + 10 - xTroop - GetSystemMetrics(SM_CXVSCROLL) - 19)
+  TrRow := (xRightPanel + 10 - xTroop - DpiGetSystemMetrics(SM_CXVSCROLL) - 19)
     div TrPitch;
   TrCnt := 0;
@@ -7440 +7446 @@
   else
     Popup.Popup(Left + TDpiControl(Sender).Left + 4, Top + TDpiControl(Sender).Top +
-      GetSystemMetrics(SM_CYCAPTION) + 4);
+      DpiGetSystemMetrics(SM_CYCAPTION) + 4);
 end;
 
@@ -7600 +7606 @@
           GamePopup.Popup(Left, Top + TopBarHeight - 1)
         else
-          GamePopup.Popup(Left + 4, Top + GetSystemMetrics(SM_CYCAPTION) + 4 +
+          GamePopup.Popup(Left + 4, Top + DpiGetSystemMetrics(SM_CYCAPTION) + 4 +
             TopBarHeight - 1);
       end
@@ -7890 +7896 @@
       GamePopup.Popup(Left, Top + TopBarHeight - 1)
     else
-      GamePopup.Popup(Left + 4, Top + GetSystemMetrics(SM_CYCAPTION) + 4 +
+      GamePopup.Popup(Left + 4, Top + DpiGetSystemMetrics(SM_CYCAPTION) + 4 +
         TopBarHeight - 1);
     exit