Changeset 463 for branches/highdpi/Packages/CevoComponents/DrawDlg.pas

Timestamp:

Nov 29, 2023, 2:35:44 PM (5 months ago)

Author:

chronos

Message:

• Modified: HighDpi branch updated to trunk version.

File:

• branches/highdpi/Packages/CevoComponents/DrawDlg.pas (modified) (19 diffs)

branches/highdpi/Packages/CevoComponents/DrawDlg.pas

@@ -1 +1 @@
 unit DrawDlg;
 
-{$mode delphi}{$H+}
-
 interface
 
 uses
-  UDpiControls, Classes, SysUtils, Forms, LCLIntf, LCLType, {$IFDEF LINUX}LMessages,{$ENDIF}
+  UDpiControls, Classes, SysUtils, Forms, LCLIntf, LCLType, {$IFDEF UNIX}LMessages,{$ENDIF}
   Messages, Graphics, Controls, ButtonBase, ButtonA, ButtonB, Area, ScreenTools
   {$IFDEF LCLGTK2}, Gtk2Globals{$ENDIF};
@@ -48 +46 @@
     Lines: Integer;
     TopSpace: Integer;
-    procedure SplitText(preview: boolean);
+    procedure SplitText(Preview: Boolean);
     procedure CorrectHeight;
   end;
@@ -76 +74 @@
   MoveActive := False;
   AddHandlerOnVisibleChanged(VisibleChangedHandler);
-  {$IFDEF LINUX}
+  {$IFDEF UNIX}
   OnDeactivate := DoDeactivate;
   {$ENDIF}
@@ -102 +100 @@
   else
   begin
-    Pos := ScalePointFromNative(Point(Integer(Msg.LParam and $ffff),
-      Integer((Msg.LParam shr 16) and $ffff)));
+    Pos := Point(ScaleFromNative(Integer(Msg.LParam and $ffff)),
+      ScaleFromNative(Integer((Msg.LParam shr 16) and $ffff)));
     if Pos.Y >= Top + TitleHeight then
       Msg.Result := HTCLIENT
@@ -131 +129 @@
   MousePos1: TPoint;
   MousePos2: TPoint;
-{$IFDEF LINUX}
+{$IFDEF UNIX}
   MousePosNew: TPoint;
   NewFormPos: TPoint;
 {$ENDIF}
 begin
-  MousePos1 := DpiMouse.CursorPos;
-  inherited;
-  MousePos2 := DpiMouse.CursorPos;
-  {$IFDEF LINUX}
+  MousePos1 := Mouse.CursorPos;
+  inherited;
+  MousePos2 := Mouse.CursorPos;
+  {$IFDEF UNIX}
   // Only if client is not doing own mouse move handling
   if not Assigned(OnMouseDown) or not Assigned(OnMouseMove) or not Assigned(OnMouseUp) then begin
     // HitTest is not supported under Linux GTK2 so use form inside move mechanizm
-    NewFormPos := ScreenToClient(DpiMouse.CursorPos);
+    NewFormPos := ScreenToClient(Mouse.CursorPos);
     if (NewFormPos.X >= 0) and (NewFormPos.X < Width) and
       (NewFormPos.Y >= 0) and (NewFormPos.Y < Height) and
@@ -149 +147 @@
       MoveMousePos := ClientToScreen(Point(X, Y));
       MoveFormPos := Point(Left, Top);
-      MousePosNew := DpiMouse.CursorPos;
+      MousePosNew := Mouse.CursorPos;
       // Activate move only if mouse position was not changed during inherited call
       if (MousePos1.X = MousePos2.X) and (MousePos1.Y = MousePos2.Y) then begin
@@ -197 +195 @@
   {$IFDEF LCLGTK2}
   // GTK2 bug workaround https://bugs.freepascal.org/view.php?id=35720
-  if Visible then LastMouse.WinControl := Self.GetNativeForm;
+  if Visible then LastMouse.WinControl := Self;
   {$ENDIF}
 end;
@@ -208 +206 @@
 procedure TDrawDlg.InitButtons;
 var
-  cix: integer;
+  cix: Integer;
   // ButtonDownSound, ButtonUpSound: string;
 begin
@@ -230 +228 @@
 procedure TDrawDlg.SmartInvalidate;
 var
-  i: integer;
+  i: Integer;
   r0, r1: HRgn;
 begin
@@ -242 +240 @@
       DeleteObject(r1);
     end;
-  InvalidateRgn(Handle, r0, false);
+  InvalidateRgn(Handle, r0, False);
   DeleteObject(r0);
 end;
@@ -250 +248 @@
 procedure TBaseMessgDlg.FormCreate(Sender: TObject);
 begin
-  Left := (DpiScreen.Width - Width) div 2;
+  Left := (Screen.Width - Width) div 2;
   Canvas.Font.Assign(UniFont[ftNormal]);
   Canvas.Brush.Style := bsClear;
   MessgText := '';
   TopSpace := 0;
-  TitleHeight := DpiScreen.Height;
+  TitleHeight := Screen.Height;
   if csDesigning in ComponentState then Exit;
   InitButtons;
@@ -262 +260 @@
 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),
+  PaintBackground(Self, 3 + Border, 3 + Border, ClientWidth - (6 + 2 * Border),
     ClientHeight - (6 + 2 * Border));
   for i := 0 to Border do
@@ -276 +274 @@
     ClientHeight - (3 + Border), MainTexture.ColorBevelLight,
     MainTexture.ColorBevelShade);
-  SplitText(false);
+  SplitText(False);
 
   for cix := 0 to ControlCount - 1 do
@@ -283 +281 @@
 end;
 
-procedure TBaseMessgDlg.SplitText(preview: boolean);
-var
-  Start, Stop, OrdinaryStop, LinesCount: integer;
+procedure TBaseMessgDlg.SplitText(Preview: Boolean);
+var
+  Start, Stop, OrdinaryStop, LinesCount: Integer;
   s: string;
 begin
@@ -296 +294 @@
       (BiColorTextWidth(Canvas, Copy(MessgText, Start, Stop - Start + 1)) <
       ClientWidth - 56) do
-      inc(Stop);
+      Inc(Stop);
     if Stop <> Length(MessgText) then
     begin
@@ -305 +303 @@
         (MessgText[OrdinaryStop + 1] = '\');
       if (OrdinaryStop + 1 - Start) * 2 >= Stop - Start then
-        Stop := OrdinaryStop
-    end;
-    if not preview then
+        Stop := OrdinaryStop;
+    end;
+    if not Preview then
     begin
       s := Copy(MessgText, Start, Stop - Start + 1);
@@ -315 +313 @@
     end;
     Start := Stop + 2;
-    inc(LinesCount)
-  end;
-  if preview then
+    inc(LinesCount);
+  end;
+  if Preview then
     Lines := LinesCount;
 end;
@@ -323 +321 @@
 procedure TBaseMessgDlg.CorrectHeight;
 var
-  i: integer;
+  i: Integer;
 begin
   ClientHeight := 72 + Border + TopSpace + Lines * MessageLineSpacing;
-  Top := (DpiScreen.Height - ClientHeight) div 2;
+  Top := (Screen.Height - ClientHeight) div 2;
   for i := 0 to ControlCount - 1 do
     Controls[i].Top := ClientHeight - (34 + Border);
@@ -333 +331 @@
 end.
 
+
+