Changeset 734

Timestamp:

Jan 17, 2026, 4:57:01 PM (9 hours ago)

Author:

chronos

Message:

• Fixed: Some buttons were not paint correctly with Qt5 widgetset.

Location:

trunk/Packages/CevoComponents

Files:

• ButtonB.pas (modified) (3 diffs)
• ButtonBase.pas (modified) (2 diffs)
• EOTButton.pas (modified) (1 diff)

trunk/Packages/CevoComponents/ButtonB.pas

@@ -4 +4 @@
 
 uses
-  ButtonBase, Classes, LCLIntf, LCLType,
+  ButtonBase, Classes, LCLIntf, LCLType, SysUtils,
   {$IFDEF DPI}Dpi.Graphics{$ELSE}Graphics{$ENDIF};
 
 type
+
+  { TButtonB }
+
   TButtonB = class(TButtonBase)
-    constructor Create(AOwner: TComponent); override;
   private
     FMask: TBitmap;
     FIndex: Integer;
+    FBuffer: TBitmap;
     procedure SetIndex(Text: Integer);
   protected
     procedure Paint; override;
   public
+    constructor Create(AOwner: TComponent); override;
+    destructor Destroy; override;
     property Mask: TBitmap read FMask write FMask;
   published
@@ -37 +42 @@
 end;
 
-constructor TButtonB.Create(AOwner: TComponent);
+constructor TButtonB.Create;
 begin
   inherited;
   ShowHint := True;
   SetBounds(0, 0, 25, 25);
+  FBuffer := TBitmap.Create;
+  FBuffer.PixelFormat := TPixelFormat.pf24bit;
+  FBuffer.SetSize(Width, Height);
+  FBuffer.Canvas.FillRect(0, 0, FBuffer.Width, FBuffer.Height);
+end;
+
+destructor TButtonB.Destroy;
+begin
+  FreeAndNil(FBuffer);
+  inherited;
 end;
 
@@ -48 +63 @@
   with Canvas do
     if FGraphic <> nil then begin
-      BitBltCanvas(Canvas, 0, 0, 25, 25, FGraphic.Canvas, 169,
+      UnshareBitmap(FBuffer);
+      BitBltBitmap(FBuffer, 0, 0, Width, Height, FGraphic, 169,
         243 + 26 * Byte(FDown));
       if FIndex >= 0 then begin
-        BitBltCanvas(Canvas, 0, 0, 25, 25, FMask.Canvas,
+        BitBltBitmap(FBuffer, 0, 0, Width, Height, FMask,
           1 + FIndex mod 12 * 26, 337 + FIndex div 12 * 26, SRCAND);
-        BitBltCanvas(Canvas, 0, 0, 25, 25, FGraphic.Canvas,
+        BitBltBitmap(FBuffer, 0, 0, Width, Height, FGraphic,
           1 + FIndex mod 12 * 26, 337 + FIndex div 12 * 26, SRCPAINT);
       end;
+      BitBltCanvas(Canvas, 0, 0, Width, Height, FBuffer.Canvas, 0, 0);
     end else begin
       Brush.Color := $0000FF;
-      FrameRect(Rect(0, 0, 25, 25));
+      FrameRect(Rect(0, 0, Width, Height));
     end;
+  inherited;
 end;
 

trunk/Packages/CevoComponents/ButtonBase.pas

@@ -111 +111 @@
         { PlayDownSound; }
         FDown := True;
-        Paint;
+        Invalidate;
         if @DownChangedProc <> nil then
           DownChangedProc(Self);
@@ -120 +120 @@
       { PlayUpSound; }
       FDown := False;
-      Paint;
+      Invalidate;
       if @DownChangedProc <> nil then
         DownChangedProc(Self);

trunk/Packages/CevoComponents/EOTButton.pas

@@ -22 +22 @@
     procedure SetIndex(X: Integer);
   protected
-    Buffer, Back: TBitmap;
+    Buffer: TBitmap;
+    Back: TBitmap;
     procedure Paint; override;
   public