Changeset 721 for trunk/Packages/CevoComponents/ScreenTools.pas

Timestamp:

Jan 12, 2026, 4:03:17 PM (8 hours ago)

Author:

chronos

Message:

• Fixed: Limit maximum width of negative growth progress bar.

File:

• trunk/Packages/CevoComponents/ScreenTools.pas (modified) (8 diffs)

trunk/Packages/CevoComponents/ScreenTools.pas

@@ -91 +91 @@
   T: TTexture);
 procedure CountBar(Dst: TBitmap; X, Y, W: Integer; Kind: Integer;
-  Cap: string; Val: Integer; T: TTexture);
+  Cap: string; Val: Integer; Texture: TTexture);
 procedure PaintProgressBar(Canvas: TCanvas; Kind, X, Y, Pos, Growth, Max: Integer;
-  T: TTexture);
+  Texture: TTexture);
 procedure PaintRelativeProgressBar(Canvas: TCanvas;
   Kind, X, Y, Size, Pos, Growth, Max: Integer; IndicateComplete: Boolean;
-  T: TTexture);
+  Texture: TTexture);
 procedure PaintLogo(Canvas: TCanvas; X, Y, LightColor, ShadeColor: Integer);
 procedure DrawBufferEnsureSize(Width, Height: Integer);
@@ -1435 +1435 @@
 
 procedure CountBar(Dst: TBitmap; X, Y, W: Integer; Kind: Integer;
-  Cap: string; Val: Integer; T: TTexture);
+  Cap: string; Val: Integer; Texture: TTexture);
 var
   I, sd, ld, cl, xIcon, yIcon: Integer;
@@ -1448 +1448 @@
     // xIcon:=x+100;
     // yIcon:=y;
-    // DLine(Dst.Canvas,x-2,x+170+32,y+16,T.ColorBevelShade,T.ColorBevelLight);
+    // DLine(Dst.Canvas,x-2,x+170+32,y+16,Texture.ColorBevelShade,Texture.ColorBevelLight);
 
     xIcon := X - 5;
     yIcon := Y + 15;
-    DLine(Dst.Canvas, X - 2, xIcon + W + 2, yIcon + 16, T.ColorBevelShade,
-      T.ColorBevelLight);
+    DLine(Dst.Canvas, X - 2, xIcon + W + 2, yIcon + 16, Texture.ColorBevelShade,
+      Texture.ColorBevelLight);
 
     S := IntToStr(Val);
@@ -1460 +1460 @@
     else
       cl := -1;
-    LoweredTextOut(Dst.Canvas, cl, T, X - 2, Y, Cap);
-    LoweredTextOut(Dst.Canvas, cl, T,
+    LoweredTextOut(Dst.Canvas, cl, Texture, X - 2, Y, Cap);
+    LoweredTextOut(Dst.Canvas, cl, Texture,
       xIcon + W + 2 - BiColorTextWidth(Dst.Canvas, S), yIcon, S);
 
@@ -1531 +1531 @@
 
 procedure PaintProgressBar(Canvas: TCanvas; Kind, X, Y, Pos, Growth, Max: Integer;
-  T: TTexture);
+  Texture: TTexture);
 var
   I: Integer;
@@ -1543 +1543 @@
     begin
       Growth := Growth - Pos;
+      if Growth > Max then Growth := Max;
       Pos := 0;
     end;
@@ -1549 +1550 @@
     Growth := Max - Pos;
   Frame(Canvas, X - 1, Y - 1, X + Max, Y + 7, $000000, $000000);
-  RFrame(Canvas, X - 2, Y - 2, X + Max + 1, Y + 8, T.ColorBevelShade,
-    T.ColorBevelLight);
+  RFrame(Canvas, X - 2, Y - 2, X + Max + 1, Y + 8, Texture.ColorBevelShade,
+    Texture.ColorBevelLight);
   with Canvas do
   begin
@@ -1585 +1586 @@
 procedure PaintRelativeProgressBar(Canvas: TCanvas;
   Kind, X, Y, Size, Pos, Growth, Max: Integer; IndicateComplete: Boolean;
-  T: TTexture);
+  Texture: TTexture);
 begin
   if Growth > 0 then
     PaintProgressBar(Canvas, Kind, X, Y, Pos * Size div Max,
-      (Growth * Size + Max div 2) div Max, Size, T)
+      (Growth * Size + Max div 2) div Max, Size, Texture)
   else
     PaintProgressBar(Canvas, Kind, X, Y, Pos * Size div Max,
-      (Growth * Size - Max div 2) div Max, Size, T);
+      (Growth * Size - Max div 2) div Max, Size, Texture);
   if IndicateComplete and (Pos + Growth >= Max) then
     Sprite(Canvas, HGrSystem, X + Size - 10, Y - 7, 23, 16, 1, 129);