Changeset 522 for trunk/Packages

Timestamp:

Jan 7, 2024, 10:24:51 PM (11 months ago)

Author:

chronos

Message:

• Modified: Code cleanup.
• Added: High DPI aware SetWindowPos function.

Location:

trunk/Packages

Files:

• CevoComponents/ScreenTools.pas (modified) (10 diffs)
• DpiControls/Dpi.Common.pas (modified) (3 diffs)

trunk/Packages/CevoComponents/ScreenTools.pas

@@ -87 +87 @@
 procedure VDarkGradient(Canvas: TCanvas; X, Y, Height, Kind: Integer);
 procedure UnderlinedTitleValue(Canvas: TCanvas; Title, Value: string; X, Y, Width: Integer);
-procedure NumberBar(Dst: TBitmap; X, Y: Integer; Cap: string; val: Integer;
+procedure NumberBar(Dst: TBitmap; X, Y: Integer; Cap: string; Val: Integer;
   T: TTexture);
 procedure CountBar(Dst: TBitmap; X, Y, W: Integer; Kind: Integer;
-  Cap: string; val: Integer; T: TTexture);
+  Cap: string; Val: Integer; T: TTexture);
 procedure PaintProgressBar(Canvas: TCanvas; Kind, X, Y, Pos, Growth, Max: Integer;
   T: TTexture);
@@ -1397 +1397 @@
 
 procedure NumberBar(Dst: TBitmap; X, Y: Integer; Cap: string;
-  val: Integer; T: TTexture);
+  Val: Integer; T: TTexture);
 var
   S: string;
 begin
-  if val > 0 then
+  if Val > 0 then
   begin
     DLine(Dst.Canvas, X - 2, X + 170, Y + 16, T.ColorBevelShade,
       T.ColorBevelLight);
     LoweredTextOut(Dst.Canvas, -1, T, X - 2, Y, Cap);
-    S := IntToStr(val);
+    S := IntToStr(Val);
     RisedTextOut(Dst.Canvas, X + 170 - BiColorTextWidth(Dst.Canvas,
       S), Y, S);
@@ -1413 +1413 @@
 
 procedure CountBar(Dst: TBitmap; X, Y, W: Integer; Kind: Integer;
-  Cap: string; val: Integer; T: TTexture);
+  Cap: string; Val: Integer; T: TTexture);
 var
   I, sd, ld, cl, xIcon, yIcon: Integer;
   S: string;
 begin
-  // val:=random(40); //!!!
-  if val = 0 then
+  // Val := Random(40); //!!!
+  if Val = 0 then
     Exit;
   Assert(Kind >= 0);
@@ -1433 +1433 @@
       T.ColorBevelLight);
 
-    S := IntToStr(val);
-    if val < 0 then
+    S := IntToStr(Val);
+    if Val < 0 then
       cl := $0000FF
     else
@@ -1442 +1442 @@
       xIcon + W + 2 - BiColorTextWidth(Dst.Canvas, S), yIcon, S);
 
-    if (Kind = 12) and (val >= 100) then
+    if (Kind = 12) and (Val >= 100) then
     begin // science with symbol for 100
-      val := val div 10;
-      sd := 14 * (val div 10 + val mod 10 - 1);
+      Val := Val div 10;
+      sd := 14 * (Val div 10 + Val mod 10 - 1);
       if sd = 0 then
         sd := 1;
@@ -1452 +1452 @@
       else
         ld := W - 44;
-      for I := 0 to val mod 10 - 1 do
+      for I := 0 to Val mod 10 - 1 do
       begin
         BitBltCanvas(Dst.Canvas, xIcon + 4 + I * (14 * ld div sd), yIcon + 2 + 1, 14,
@@ -1460 +1460 @@
           14, 14, 67 + Kind mod 8 * 15, 70 + Kind div 8 * 15);
       end;
-      for I := 0 to val div 10 - 1 do
+      for I := 0 to Val div 10 - 1 do
       begin
-        BitBltCanvas(Dst.Canvas, xIcon + 4 + (val mod 10) *
+        BitBltCanvas(Dst.Canvas, xIcon + 4 + (Val mod 10) *
           (14 * ld div sd) + I * (14 * ld div sd), yIcon + 3, 14, 14,
           HGrSystem.Mask.Canvas, 67 + 7 mod 8 * 15,
           70 + 7 div 8 * 15, SRCAND);
-        Sprite(Dst, HGrSystem, xIcon + 3 + (val mod 10) *
+        Sprite(Dst, HGrSystem, xIcon + 3 + (Val mod 10) *
           (14 * ld div sd) + I * (14 * ld div sd), yIcon + 2, 14,
           14, 67 + 7 mod 8 * 15,
@@ -1474 +1474 @@
     else
     begin
-      val := abs(val);
-      if val mod 10 = 0 then
-        sd := 14 * (val div 10 - 1)
+      Val := Abs(Val);
+      if Val mod 10 = 0 then
+        sd := 14 * (Val div 10 - 1)
       else
-        sd := 10 * (val mod 10 - 1) + 14 * (val div 10);
+        sd := 10 * (Val mod 10 - 1) + 14 * (Val div 10);
       if sd = 0 then
         sd := 1;
@@ -1485 +1485 @@
       else
         ld := W - 44;
-      for I := 0 to val div 10 - 1 do
+      for I := 0 to Val div 10 - 1 do
       begin
         BitBltCanvas(Dst.Canvas, xIcon + 4 + I * (14 * ld div sd), yIcon + 3, 14, 14,
@@ -1493 +1493 @@
           14, 14, 67 + Kind mod 8 * 15, 70 + Kind div 8 * 15);
       end;
-      for I := 0 to val mod 10 - 1 do
+      for I := 0 to Val mod 10 - 1 do
       begin
-        BitBltCanvas(Dst.Canvas, xIcon + 4 + (val div 10) *
+        BitBltCanvas(Dst.Canvas, xIcon + 4 + (Val div 10) *
           (14 * ld div sd) + I * (10 * ld div sd), yIcon + 7, 10, 10,
           HGrSystem.Mask.Canvas, 66 + Kind mod 11 * 11,
           115 + Kind div 11 * 11, SRCAND);
-        Sprite(Dst, HGrSystem, xIcon + 3 + (val div 10) *
+        Sprite(Dst, HGrSystem, xIcon + 3 + (Val div 10) *
           (14 * ld div sd) + I * (10 * ld div sd), yIcon + 6, 10,
           10, 66 + Kind mod 11 * 11,

trunk/Packages/DpiControls/Dpi.Common.pas

@@ -21 +21 @@
 function ScrollDC(Canvas: TCanvas; dx: Longint; dy: Longint; const lprcScroll: TRect;
   const lprcClip:TRect; hrgnUpdate: Handle; lprcUpdate: PRect): Boolean; overload;
+function SetWindowPos(hWnd: HWND; hWndInsertAfter: HWND;
+  X, Y, cx, cy: Integer; uFlags: UINT): Boolean;
 function ScaleToNative(Value: Integer): Integer;
 function ScaleToNativeDist(Base, Value: Integer): Integer;
@@ -84 +86 @@
 end;
 
-function Ceil(const X: Single): Integer;
-begin
-  if X > High(Integer) then
-    Result := High(Integer)
-  else if X < Low(Integer) then
-    Result := Low(Integer)
-  else begin
-    Result := Trunc(X);
-    if (Result <> X) then begin
-      if (Result > 0) then Inc(Result) else Dec(Result);
-    end;
-  end;
+function SetWindowPos(hWnd: HWND; hWndInsertAfter: HWND; X, Y, cx, cy: Integer;
+  uFlags: UINT): Boolean;
+begin
+  LCLIntf.SetWindowPos(hWnd, hWndInsertAfter, ScaleToNative(X), ScaleToNative(Y),
+    ScaleToNative(cx), ScaleToNative(cy), uFlags);
 end;
 
@@ -110 +105 @@
 function ScaleFromNative(Value: Integer): Integer;
 begin
-  Result := Floor(Value * 96 / ScreenInfo.Dpi);
+  Result := Round(Value * 96 / ScreenInfo.Dpi);
 end;