Changeset 474 for trunk/Inp.pas

Timestamp:

Dec 4, 2023, 7:18:18 PM (5 months ago)

Author:

chronos

Message:

• Fixed: More high dpi related fixes.

File:

• trunk/Inp.pas (modified) (4 diffs)

trunk/Inp.pas

@@ -5 +5 @@
 
 uses
-  ScreenTools, LCLIntf, LCLType, SysUtils, Classes, DrawDlg, ButtonA, StdCtrls,
-  {$IFDEF DPI}Dpi.Graphics, Dpi.Controls, Dpi.Forms, System.UITypes{$ELSE}
-  Graphics, Controls, Forms{$ENDIF};
+  ScreenTools, LCLIntf, LCLType, SysUtils, Classes, DrawDlg, ButtonA,
+  {$IFDEF DPI}Dpi.Graphics, Dpi.Controls, Dpi.Forms, Dpi.StdCtrls, System.UITypes{$ELSE}
+  Graphics, Controls, Forms, StdCtrls{$ENDIF};
 
 type
   TInputDlg = class(TDrawDlg)
-    OKBtn: TButtonA;
-    EInput: TEdit;
-    procedure OKBtnClick(Sender: TObject);
+    ButtonOk: TButtonA;
+    EditInput: TEdit;
+    procedure ButtonOkClick(Sender: TObject);
     procedure FormPaint(Sender: TObject);
     procedure FormCreate(Sender: TObject);
@@ -44 +44 @@
 procedure TInputDlg.FormPaint(Sender: TObject);
 begin
-  PaintBackground(self, 3, 3, ClientWidth - 6, ClientHeight - 6);
-  Frame(Canvas, 0, 0, ClientWidth - 1, ClientHeight - 1, 0, 0);
-  Frame(Canvas, 1, 1, ClientWidth - 2, ClientHeight - 2,
+  PaintBackground(Self, 3, 3, Width - 6, Height - 6);
+  Frame(Canvas, 0, 0, Width - 1, Height - 1, 0, 0);
+  Frame(Canvas, 1, 1, Width - 2, Height - 2,
     MainTexture.ColorBevelLight, MainTexture.ColorBevelShade);
-  Frame(Canvas, 2, 2, ClientWidth - 3, ClientHeight - 3,
+  Frame(Canvas, 2, 2, Width - 3, Height - 3,
     MainTexture.ColorBevelLight, MainTexture.ColorBevelShade);
-  EditFrame(Canvas, EInput.BoundsRect, MainTexture);
-  BtnFrame(Canvas, OKBtn.BoundsRect, MainTexture);
-  RisedTextOut(Canvas, (ClientWidth - BiColorTextWidth(Canvas, Caption)) div 2,
+  EditFrame(Canvas, EditInput.BoundsRect, MainTexture);
+  BtnFrame(Canvas, ButtonOk.BoundsRect, MainTexture);
+  RisedTextOut(Canvas, (Width - BiColorTextWidth(Canvas, Caption)) div 2,
     9, Caption);
-  { Corner(canvas,1,1,0,MainTexture);
-    Corner(Canvas,ClientWidth-9,1,1,MainTexture);
-    Corner(Canvas,1,ClientHeight-9,2,MainTexture);
-    Corner(Canvas,ClientWidth-9,ClientHeight-9,3,MainTexture); }
+  { Corner(canvas, 1, 1, 0, MainTexture);
+    Corner(Canvas, Width - 9, 1, 1, MainTexture);
+    Corner(Canvas, 1, Height - 9, 2, MainTexture);
+    Corner(Canvas, Width - 9, Height - 9, 3, MainTexture); }
 end;
 
-procedure TInputDlg.OKBtnClick(Sender: TObject);
+procedure TInputDlg.ButtonOkClick(Sender: TObject);
 begin
-  if EInput.Text = '' then
+  if EditInput.Text = '' then
     ModalResult := mrCancel
   else
@@ -70 +70 @@
 procedure TInputDlg.EInputKeyPress(Sender: TObject; var Key: Char);
 begin
-  if (Key = #13) and (EInput.Text <> '') then
+  if (Key = #13) and (EditInput.Text <> '') then
   begin
     Key := #0;
@@ -84 +84 @@
 procedure TInputDlg.FormShow(Sender: TObject);
 begin
-  OKBtn.Caption := Phrases.Lookup('BTN_OK');
-  EInput.Font.Color := MainTexture.ColorMark;
-  EInput.SelStart := 0;
-  EInput.SelLength := Length(EInput.Text);
+  ButtonOk.Caption := Phrases.Lookup('BTN_OK');
+  EditInput.Font.Color := MainTexture.ColorMark;
+  EditInput.SelStart := 0;
+  EditInput.SelLength := Length(EditInput.Text);
   if Center then
     CenterToRect(Rect(0, 0, Screen.Width, Screen.Height));