Changeset 515 for trunk

Timestamp:

Jan 3, 2024, 4:53:46 PM (4 months ago)

Author:

chronos

Message:

• Modified: Improved scaling of ImageOp_BCC procedure.
• Fixed: Do not initialize City dialog on game closure.

Location:

trunk

Files:

• LocalPlayer/Term.pas (modified) (1 diff)
• Packages/CevoComponents/ScreenTools.pas (modified) (4 diffs)
• Packages/DpiControls/Dpi.Common.pas (modified) (4 diffs)

trunk/LocalPlayer/Term.pas

@@ -2771 +2771 @@
       begin
         SaveSettings;
-        CityDlg.CloseAction := None;
+        if Assigned(FCityDlg) then CityDlg.CloseAction := None;
         ApplyToVisibleForms(faClose);
         if LogDlg.Visible then

trunk/Packages/CevoComponents/ScreenTools.pas

@@ -695 +695 @@
     PixelSrc.NextLine;
   end;
-  src.EndUpdate;
+  Src.EndUpdate;
   Dst.EndUpdate;
 end;
@@ -709 +709 @@
   SrcPixel: TPixelPointer;
   DstPixel: TPixelPointer;
-begin
+  DstWidth, DstHeight: Integer;
+  SrcWidth, SrcHeight: Integer;
+begin
+  if xDst < 0 then begin
+    Width := Width + xDst;
+    xSrc := xSrc - xDst;
+    xDst := 0;
+  end;
+  if yDst < 0 then begin
+    Height := Height + yDst;
+    ySrc := ySrc - yDst;
+    yDst := 0;
+  end;
+  if xDst + Width > Dst.Width then
+    Width := Dst.Width - xDst;
+  if yDst + Height > Dst.Height then
+    Height := Dst.Height - yDst;
+  if (Width < 0) or (Height < 0) then
+    Exit;
+  DstWidth := ScaleToNativeDist(xDst, Width);
+  DstHeight := ScaleToNativeDist(yDst, Height);
+  SrcWidth := ScaleToNativeDist(xSrc, Width);
+  SrcHeight := ScaleToNativeDist(ySrc, Height);
   xDst := ScaleToNative(xDst);
   yDst := ScaleToNative(yDst);
   xSrc := ScaleToNative(xSrc);
   ySrc := ScaleToNative(ySrc);
-  Width := ScaleToNative(Width);
-  Height := ScaleToNative(Height);
-  if xDst < 0 then begin
-    Width := Width + xDst;
-    xSrc := xSrc - xDst;
-    xDst := 0;
-  end;
-  if yDst < 0 then begin
-    Height := Height + yDst;
-    ySrc := ySrc - yDst;
-    yDst := 0;
-  end;
-  if xDst + Width > ScaleToNative(Dst.Width) then
-    Width := ScaleToNative(Dst.Width) - xDst;
-  if yDst + Height > ScaleToNative(Dst.Height) then
-    Height := ScaleToNative(Dst.Height) - yDst;
-  if (Width < 0) or (Height < 0) then
-    Exit;
 
   Src.BeginUpdate;
@@ -737 +741 @@
   SrcPixel := TPixelPointer.Create(Src, xSrc, ySrc);
   DstPixel := TPixelPointer.Create(Dst, xDst, yDst);
-  for iy := 0 to Height - 1 do begin
-    for ix := 0 to Width - 1 do begin
+  for iy := 0 to DstHeight - 1 do begin
+    for ix := 0 to DstWidth - 1 do begin
       trans := SrcPixel.PixelB * 2; // green channel = transparency
       amp1 := SrcPixel.PixelG * 2;
@@ -756 +760 @@
       end;
 
-      SrcPixel.NextPixel;
+      if ix < SrcWidth - 1 then SrcPixel.NextPixel;
       DstPixel.NextPixel;
     end;
-    SrcPixel.NextLine;
+    if iy < SrcHeight - 1 then SrcPixel.NextLine
+      else SrcPixel.SetX(0);
     DstPixel.NextLine;
   end;

trunk/Packages/DpiControls/Dpi.Common.pas

@@ -185 +185 @@
   DstWidth, DstHeight: Integer;
   SrcWidth, SrcHeight: Integer;
-  ReduceWidth, ReduceHeight: Integer;
 begin
   {$IFDEF WINDOWS}
@@ -198 +197 @@
   SrcWidth := ScaleToNativeDist(XSrc, Width);
   SrcHeight := ScaleToNativeDist(YSrc, Height);
-  if (Frac(ScaleFloatToNative(XSrc)) > 0) or
-    (Frac(ScaleFloatToNative(X)) > 0) then ReduceWidth := 1
-    else ReduceWidth := 0;
-  if (Frac(ScaleFloatToNative(YSrc)) > 0) or
-    (Frac(ScaleFloatToNative(Y)) > 0) then ReduceHeight := 1
-    else ReduceHeight := 0;
   if (DstWidth = SrcWidth) and (DstHeight = SrcHeight) then begin
     Result := LCLIntf.BitBlt(DestDC, ScaleToNative(X), ScaleToNative(Y),
@@ -210 +203 @@
   end else begin
     Result := LCLIntf.BitBlt(DestDC, ScaleToNative(X), ScaleToNative(Y),
-      DstWidth - ReduceWidth, DstHeight - ReduceHeight, SrcDC,
+      SrcWidth, SrcHeight, SrcDC,
       ScaleToNative(XSrc), ScaleToNative(YSrc), Rop);
 
@@ -224 +217 @@
         ScaleToNative(XSrc), ScaleToNative(YSrc) + SrcHeight - (DstHeight - SrcHeight), Rop);
     end;
-
   {  Result := LCLIntf.StretchBlt(DestDC, ScaleToNative(X), ScaleToNative(Y),
       DstWidth, DstHeight, SrcDC,