Changeset 412 for branches/highdpi/Packages/CevoComponents/BaseWin.pas

Timestamp:

Nov 4, 2021, 2:59:11 PM (3 years ago)

Author:

chronos

Message:

• Modified: Merged changes from trunk r411.

File:

• branches/highdpi/Packages/CevoComponents/BaseWin.pas (modified) (13 diffs)

branches/highdpi/Packages/CevoComponents/BaseWin.pas

@@ -14 +14 @@
   TBufferedDrawDlg = class(TDrawDlg)
   public
-    UserLeft, UserTop: integer;
+    UserLeft: Integer;
+    UserTop: Integer;
     constructor Create(AOwner: TComponent); override;
     destructor Destroy; override;
@@ -21 +22 @@
     procedure FormKeyDown(Sender: TObject; var Key: Word; Shift: TShiftState);
     procedure FormDeactivate(Sender: TObject);
-    procedure SmartUpdateContent(ImmUpdate: boolean = false);
+    procedure SmartUpdateContent(ImmUpdate: Boolean = false);
     procedure StayOnTop_Workaround;
   protected
-    FWindowMode, ModalFrameIndent: integer;
+    FWindowMode: Integer;
+    ModalFrameIndent: Integer;
     HelpContext: string;
-    procedure ShowNewContent(NewMode: integer; forceclose: boolean = false);
-    procedure MarkUsedOffscreen(xMax, yMax: integer);
+    procedure ShowNewContent(NewMode: Integer; ForceClose: Boolean = False);
+    procedure MarkUsedOffscreen(xMax, yMax: Integer);
     procedure OffscreenPaint; virtual;
     procedure VPaint; virtual;
   public
-    UsedOffscreenWidth, UsedOffscreenHeight: integer;
+    UsedOffscreenWidth: Integer;
+    UsedOffscreenHeight: Integer;
     Offscreen: TDpiBitmap;
     OffscreenUser: TDpiForm;
@@ -53 +56 @@
     procedure InitWindowRegion;
     procedure VPaint; override;
-    procedure FillOffscreen(Left, Top, Width, Height: integer);
+    procedure FillOffscreen(Left, Top, Width, Height: Integer);
   end;
 
@@ -155 +158 @@
 procedure TBufferedDrawDlg.OffscreenPaint;
 begin
-  if (OffscreenUser <> nil) and (OffscreenUser <> self) then
+  if (OffscreenUser <> nil) and (OffscreenUser <> Self) then
     OffscreenUser.Update; // complete working with old owner to prevent rebound
-  OffscreenUser := self;
+  OffscreenUser := Self;
 end;
 
@@ -165 +168 @@
 end;
 
-procedure TBufferedDrawDlg.ShowNewContent(NewMode: integer;
-  forceclose: boolean);
-begin
-  if Visible then
-  begin
-    assert((NewMode = wmModal) or (FWindowMode <> wmModal));
+procedure TBufferedDrawDlg.ShowNewContent(NewMode: Integer;
+  ForceClose: Boolean);
+begin
+  if Visible then begin
+    Assert((NewMode = wmModal) or (FWindowMode <> wmModal));
     // don't make modal window non-modal
     if (NewMode = wmModal) and (forceclose or (FWindowMode <> wmModal)) then
@@ -194 +196 @@
         OnShow(nil);
       Invalidate;
-      BringToFront
-    end
+      BringToFront;
+    end;
   end
   else
@@ -205 +207 @@
       ShowModal
     else
-      Show
-  end
-end;
-
-procedure TBufferedDrawDlg.SmartUpdateContent(ImmUpdate: boolean);
-begin
-  if Visible then
-  begin
+      Show;
+  end;
+end;
+
+procedure TBufferedDrawDlg.SmartUpdateContent(ImmUpdate: Boolean);
+begin
+  if Visible then begin
     OffscreenPaint;
     SmartInvalidate;
@@ -220 +221 @@
 end;
 
-procedure TBufferedDrawDlg.MarkUsedOffscreen(xMax, yMax: integer);
+procedure TBufferedDrawDlg.MarkUsedOffscreen(xMax, yMax: Integer);
 begin
   if xMax > UsedOffscreenWidth then
@@ -256 +257 @@
   CaptionLeft := 0;
   CaptionRight := $FFFF;
-  WideBottom := false;
-  FullCaption := true;
-  TexOverride := false;
-  ModalIndication := true;
+  WideBottom := False;
+  FullCaption := True;
+  TexOverride := False;
+  ModalIndication := True;
   Canvas.Brush.Style := bsClear;
   InnerWidth := Width - 2 * SideFrame;
@@ -284 +285 @@
       DeleteObject(r1);
     end;
-  InvalidateRgn(Handle, r0, false);
+  InvalidateRgn(Handle, r0, False);
   DeleteObject(r0);
 end;
@@ -348 +349 @@
   // RFrame(Canvas,SideFrame-2,TitleHeight-2,ClientWidth-SideFrame+1,
   // InnerBottom+1,MainTexture.ColorBevelShade,MainTexture.ColorBevelLight);
-  if FullCaption then
-  begin
+  if FullCaption then begin
     if (FWindowMode <> wmModal) or not ModalIndication then
     begin
@@ -479 +479 @@
     // DeleteObject(r1);
   end;
-  SetWindowRgn(Handle, r0, false);
+  SetWindowRgn(Handle, r0, False);
   // DeleteObject(r0); // causes crash with Windows 95
 end;
 
-procedure TFramedDlg.FillOffscreen(Left, Top, Width, Height: integer);
+procedure TFramedDlg.FillOffscreen(Left, Top, Width, Height: Integer);
 begin
   Fill(Offscreen.Canvas, Left, Top, Width, Height,
@@ -493 +493 @@
 begin
   if Offscreen <> nil then
-    exit;
+    Exit;
   Offscreen := TDpiBitmap.Create;
   Offscreen.PixelFormat := pf24bit;