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

Timestamp:

Apr 6, 2021, 8:11:02 PM (4 years ago)

Author:

chronos

Message:

• Modified: Merged trunk branch version r348 into highdpi branch.

File:

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

branches/highdpi/Packages/CevoComponents/BaseWin.pas

@@ -87 +87 @@
 end;
 
-
 constructor TBufferedDrawDlg.Create(AOwner: TComponent);
 begin
@@ -112 +111 @@
 procedure TBufferedDrawDlg.FormClose(Sender: TObject; var Action: TCloseAction);
 begin
-  if FWindowMode = wmPersistent then
-  begin
+  if FWindowMode = wmPersistent then begin
     UserLeft := Left;
-    UserTop := Top
+    UserTop := Top;
   end;
   if OffscreenUser = self then
@@ -131 +129 @@
   Shift: TShiftState);
 begin
-  if Key = VK_ESCAPE then
-  begin
+  if Key = VK_ESCAPE then begin
     if fsModal in FormState then
-      ModalResult := mrCancel
-  end
-  else if Key = VK_RETURN then
-  begin
+      ModalResult := mrCancel;
+  end else
+  if Key = VK_RETURN then begin
     if fsModal in FormState then
-      ModalResult := mrOK
-  end
-  else if Key = VK_F1 then begin
+      ModalResult := mrOK;
+  end else
+  if Key = VK_F1 then begin
     if Assigned(ShowNewContentProc) then
       ShowNewContentProc(FWindowMode or wmPersistent, HelpContext);
-  end else if FWindowMode = wmPersistent then begin
+  end else
+  if FWindowMode = wmPersistent then begin
     if Assigned(MainFormKeyDown) then
       MainFormKeyDown(Sender, Key, Shift);
@@ -153 +150 @@
 begin
   if FWindowMode = wmSubmodal then
-    Close
+    Close;
 end;
 
@@ -316 +313 @@
     else
       MainTexture := MainTexture;
-    MainTexture := MainTexture
+    MainTexture := MainTexture;
   end;
   Canvas.Font.Assign(UniFont[ftCaption]);
@@ -330 +327 @@
   begin
     FrameTop := 0;
-    FrameBottom := ClientHeight
+    FrameBottom := ClientHeight;
   end
   else
@@ -338 +335 @@
       FrameBottom := ClientHeight - (WideFrame - NarrowFrame)
     else
-      FrameBottom := ClientHeight
+      FrameBottom := ClientHeight;
   end;
   Fill(Canvas, 3, InnerBottom + 1, ClientWidth - 6, ClientHeight - InnerBottom -
@@ -386 +383 @@
         MoveTo(ClientWidth - 3 - ModalFrameIndent, 3);
         LineTo(ClientWidth - 3 - ModalFrameIndent, TitleHeight);
-      end
+      end;
   end
   else
@@ -441 +438 @@
         LineTo(ClientWidth - CaptionLeft - 2, FrameBottom - 2);
       end;
-    end
+    end;
   end;
   RisedTextOut(Canvas, Cut - 1, 7, Caption);
@@ -496 +493 @@
 begin
   if Offscreen <> nil then
-    Exit;
+    exit;
   Offscreen := TDpiBitmap.Create;
   Offscreen.PixelFormat := pf24bit;