Changeset 527 for trunk/Packages/CevoComponents/DrawDlg.pas

Timestamp:

Jan 9, 2024, 12:28:47 AM (10 months ago)

Author:

chronos

Message:

• Fixed: Height of Message dialog was not correctly calculated.

File:

• trunk/Packages/CevoComponents/DrawDlg.pas (modified) (7 diffs)

trunk/Packages/CevoComponents/DrawDlg.pas

@@ -242 +242 @@
   r0, r1: HRgn;
 begin
-  r0 := CreateRectRgn(0, 0, ClientWidth, ClientHeight);
+  r0 := CreateRectRgn(0, 0, Width, Height);
   for i := 0 to ControlCount - 1 do
     if not (Controls[i] is TArea) and Controls[i].Visible then
@@ -271 +271 @@
 procedure TBaseMessgDlg.FormPaint(Sender: TObject);
 var
-  i, cix: Integer;
+  I, cix: Integer;
 begin
   if csDesigning in ComponentState then Exit;
-  PaintBackground(Self, 3 + Border, 3 + Border, ClientWidth - (6 + 2 * Border),
-    ClientHeight - (6 + 2 * Border));
-  for i := 0 to Border do
-    Frame(Canvas, i, i, ClientWidth - 1 - i, ClientHeight - 1 - i,
+  PaintBackground(Self, 3 + Border, 3 + Border, Width - (6 + 2 * Border),
+    Height - (6 + 2 * Border));
+  for I := 0 to Border do
+    Frame(Canvas, I, I, Width - 1 - I, Height - 1 - I,
       $000000, $000000);
-  Frame(Canvas, Border + 1, Border + 1, ClientWidth - (2 + Border),
-    ClientHeight - (2 + Border), MainTexture.ColorBevelLight,
+  Frame(Canvas, Border + 1, Border + 1, Width - (2 + Border),
+    Height - (2 + Border), MainTexture.ColorBevelLight,
     MainTexture.ColorBevelShade);
-  Frame(Canvas, 2 + Border, 2 + Border, ClientWidth - (3 + Border),
-    ClientHeight - (3 + Border), MainTexture.ColorBevelLight,
+  Frame(Canvas, 2 + Border, 2 + Border, Width - (3 + Border),
+    Height - (3 + Border), MainTexture.ColorBevelLight,
     MainTexture.ColorBevelShade);
   SplitText(False);
@@ -295 +295 @@
 var
   Start, Stop, OrdinaryStop, LinesCount: Integer;
-  s: string;
+  S: string;
 begin
   Start := 1;
@@ -304 +304 @@
     while (Stop < Length(MessgText)) and (MessgText[Stop] <> '\') and
       (BiColorTextWidth(Canvas, Copy(MessgText, Start, Stop - Start + 1)) <
-      ClientWidth - 56) do
+      Width - 56) do
       Inc(Stop);
     if Stop <> Length(MessgText) then
@@ -310 +310 @@
       OrdinaryStop := Stop;
       repeat
-        dec(OrdinaryStop)
+        Dec(OrdinaryStop)
       until (MessgText[OrdinaryStop + 1] = ' ') or
         (MessgText[OrdinaryStop + 1] = '\');
@@ -318 +318 @@
     if not Preview then
     begin
-      s := Copy(MessgText, Start, Stop - Start + 1);
+      S := Copy(MessgText, Start, Stop - Start + 1);
       LoweredTextOut(Canvas, -1, MainTexture,
-        (ClientWidth - BiColorTextWidth(Canvas, s)) div 2,
-        19 + Border + TopSpace + LinesCount * MessageLineSpacing, s);
+        (Width - BiColorTextWidth(Canvas, S)) div 2,
+        19 + Border + TopSpace + LinesCount * MessageLineSpacing, S);
     end;
     Start := Stop + 2;
@@ -332 +332 @@
 procedure TBaseMessgDlg.CorrectHeight;
 var
-  i: Integer;
-begin
-  ClientHeight := 72 + Border + TopSpace + Lines * MessageLineSpacing;
-  Top := (Screen.Height - ClientHeight) div 2;
+  I: Integer;
+begin
+  Height := 72 + Border + TopSpace + Lines * MessageLineSpacing;
+  Top := (Screen.Height - Height) div 2;
   for i := 0 to ControlCount - 1 do
-    Controls[i].Top := ClientHeight - (34 + Border);
+    Controls[i].Top := Height - (34 + Border);
 end;