Changeset 565 for trunk/Packages

Timestamp:

May 1, 2024, 12:08:20 PM (2 weeks ago)

Author:

chronos

Message:

• Modified: Start form changed to use Offscreen bitmap for drawing as Qt5 doesn't support copying from form canvas.

Location:

trunk/Packages/CevoComponents

Files:

• DrawDlg.pas (modified) (3 diffs)
• ScreenTools.pas (modified) (2 diffs)

trunk/Packages/CevoComponents/DrawDlg.pas

@@ -21 +21 @@
     procedure DoDeactivate(Sender: TObject);
   protected
+    // Defines area to grip the window for moving (from top)
     TitleHeight: Integer;
-    // defines area to grip the window for moving (from top)
     procedure InitButtons;
     procedure OnEraseBkgnd(var Msg: TMessage); message WM_ERASEBKGND;
@@ -237 +237 @@
 procedure TDrawDlg.SmartInvalidate;
 var
-  i: Integer;
-  r0, r1: HRgn;
-begin
-  r0 := CreateRectRgn(0, 0, Width, Height);
-  for i := 0 to ControlCount - 1 do
-    if not (Controls[i] is TArea) and Controls[i].Visible then
-    begin
-      with Controls[i].BoundsRect do
-        r1 := CreateRectRgn(Left, Top, Right, Bottom);
-      CombineRgn(r0, r0, r1, RGN_DIFF);
-      DeleteObject(r1);
-    end;
-  InvalidateRgn(Handle, r0, False);
-  DeleteObject(r0);
+  I: Integer;
+  R0, R1: HRgn;
+begin
+  R0 := CreateRectRgn(0, 0, Width, Height);
+  for I := 0 to ControlCount - 1 do
+    if not (Controls[I] is TArea) and Controls[I].Visible then begin
+      with Controls[I].BoundsRect do
+        R1 := CreateRectRgn(Left, Top, Right, Bottom);
+      CombineRgn(R0, R0, R1, RGN_DIFF);
+      DeleteObject(R1);
+    end;
+  InvalidateRgn(Handle, R0, False);
+  DeleteObject(R0);
 end;
 
@@ -272 +271 @@
 begin
   if csDesigning in ComponentState then Exit;
-  PaintBackground(Self, 3 + Border, 3 + Border, Width - (6 + 2 * Border),
-    Height - (6 + 2 * Border));
+  PaintBackground(Canvas, 3 + Border, 3 + Border, Width - (6 + 2 * Border),
+    Height - (6 + 2 * Border), Width, Height);
   for I := 0 to Border do
-    Frame(Canvas, I, I, Width - 1 - I, Height - 1 - I,
-      $000000, $000000);
+    Frame(Canvas, I, I, Width - 1 - I, Height - 1 - I, $000000, $000000);
   Frame(Canvas, Border + 1, Border + 1, Width - (2 + Border),
     Height - (2 + Border), MainTexture.ColorBevelLight,

trunk/Packages/CevoComponents/ScreenTools.pas

@@ -75 +75 @@
 procedure FillRectSeamless(Canvas: TCanvas; x0, y0, x1, y1, xOffset, yOffset: Integer;
   const Texture: TBitmap);
-procedure PaintBackground(Form: TForm; Left, Top, Width, Height: Integer);
+procedure PaintBackground(Canvas: TCanvas; Left, Top, Width, Height, FormWidth,
+  FormHeight: Integer);
 procedure Corner(Canvas: TCanvas; X, Y, Kind: Integer; T: TTexture);
 procedure BiColorTextOut(Canvas: TCanvas; clMain, clBack: TColor; X, Y: Integer; S: string);
@@ -1202 +1203 @@
 end;
 
-procedure PaintBackground(Form: TForm; Left, Top, Width, Height: Integer);
-begin
-  Fill(Form.Canvas, Left, Top, Width, Height, (MainTexture.Width - Form.ClientWidth) div
-    2, (MainTexture.Height - Form.ClientHeight) div 2);
+procedure PaintBackground(Canvas: TCanvas; Left, Top, Width, Height, FormWidth,
+  FormHeight: Integer);
+begin
+  Fill(Canvas, Left, Top, Width, Height, (MainTexture.Width - FormWidth) div
+    2, (MainTexture.Height - FormHeight) div 2);
 end;