fix(formutils): improved custom DPI support

Author: Torwent

osrs/interfaces/mainscreen/shop.simba

@@ -213,8 +213,6 @@ WriteLn Shop.Buy('Gold ore', ERSShopQuantity.FIFTY);
 ```
 *)
 function TRSShop.Buy(item: TRSItem; quantity: ERSShopQuantity = ERSShopQuantity.ONE): Boolean;
-var
-  i: Integer;
 begin
   Result := False;
   if not Self.IsOpen() then Exit;
@@ -237,32 +235,6 @@ begin
   Result := True;
 end;
 
-(*
-## Shop.BuyAtValue
-```pascal
-function TRSShop.BuyAtValue(item: TRSItem; quantity: Integer; price: Integer): Boolean;
-```
-Attempts to buy the specified item from the shop at a specific price using the value option.
-
-Example:
-```pascal
-WriteLn Shop.BuyAtValue('Gold ore', 10, 100);
-```
-*)
-function TRSShop.BuyAtValue(item: TRSItem; quantity: Integer; price: Integer): Boolean;
-var
-  slot, i: Integer;
-begin
-  // TODO
-  if not Self.IsOpen() then Exit;
-  if not Self.Items.Contains(item) then Exit;
-
-  Self.Items.Interact(item, 'Value');
-  Biometrics.Sleep(50, 200);
-
-  Result := True;
-end;
-
 (*
 ## Shop.Sell
 ```pascal
@@ -310,8 +282,6 @@ WriteLn Shop.GetPrice('Gold ore');
 ```
 *)
 function TRSShop.GetPrice(item: TRSItem): Integer;
-var
-  slot: Integer;
 begin
   if not Self.IsOpen() then Exit;
   if not Self.Items.Contains(item) then Exit;

utils/forms/formutils.simba

@@ -176,33 +176,95 @@ begin
   Lapify(checkbox.OnChange)(checkbox);
 end;
 
-
-
-
 var
   FormUtils: TFormUtils;
 
-
 property TLazControl.Left(value: Integer); override;
 begin
   inherited(Round(value * FormUtils.Scale));
 end;
 
+property TLazControl.Left: Integer; override;
+begin
+  Result := Round(inherited / FormUtils.Scale);
+end;
+
+
 property TLazControl.Top(value: Integer); override;
 begin
   inherited(Round(value * FormUtils.Scale));
 end;
 
+property TLazControl.Top: Integer; override;
+begin
+  Result := Round(inherited / FormUtils.Scale);
+end;
+
+
 property TLazControl.Width(value: Integer); override;
 begin
   inherited(Round(value * FormUtils.Scale));
 end;
 
+property TLazControl.Width: Integer; override;
+begin
+  Result := Round(inherited / FormUtils.Scale);
+end;
+
 property TLazControl.Height(value: Integer); override;
 begin
   inherited(Round(value * FormUtils.Scale));
 end;
 
+property TLazControl.Height: Integer; override;
+begin
+  Result := Round(inherited / FormUtils.Scale);
+end;
+
+
+
+property TLazSizeConstraints.MinWidth(value: Integer); override;
+begin
+  inherited(Round(value * FormUtils.Scale));
+end;
+
+property TLazSizeConstraints.MinWidth: Integer; override;
+begin
+  Result := Round(inherited / FormUtils.Scale);
+end;
+
+property TLazSizeConstraints.MaxWidth(value: Integer); override;
+begin
+  inherited(Round(value * FormUtils.Scale));
+end;
+
+property TLazSizeConstraints.MaxWidth: Integer; override;
+begin
+  Result := Round(inherited / FormUtils.Scale);
+end;
+
+
+property TLazSizeConstraints.MinHeight(value: Integer); override;
+begin
+  inherited(Round(value * FormUtils.Scale));
+end;
+
+property TLazSizeConstraints.MinHeight: Integer; override;
+begin
+  Result := Round(inherited / FormUtils.Scale);
+end;
+
+property TLazSizeConstraints.MaxHeight(value: Integer); override;
+begin
+  inherited(Round(value * FormUtils.Scale));
+end;
+
+property TLazSizeConstraints.MaxHeight: Integer; override;
+begin
+  Result := Round(inherited / FormUtils.Scale);
+end;
+
+
 
 property TLazControlBorderSpacing.Left(value: Integer); override;
 begin
@@ -834,6 +896,41 @@ begin
 end;
 
 
+function TLazImage.CreateEx(owner: Pointer): TLazImage; static;
+begin
+  Result := TLazImage.Create(TLazControl(owner));
+  Result.Parent := TLazComponent(owner);
+end;
+
+function TLazImage.CreateEx(owner: Pointer; caption: String; hint: String = ''; left, top, width, height: Integer = 0): TLazImage; static; overload;
+var
+  lbl: TLazLabel;
+begin
+  Result := TLazImage.CreateEx(owner);
+
+  if left > 0 then Result.Left := left;
+  if top > 0 then Result.Top := top;
+  if width > 0 then Result.Width := width;
+  if height > 0 then Result.Height := height;
+
+  if caption <> '' then
+  begin
+    lbl := TLazLabel.CreateEx(owner, caption, hint);
+    lbl.AnchorSideBottom.Control := Result;
+    lbl.AnchorSideBottom.Side := ELazAnchorSideReference.Top;
+    lbl.AnchorSideLeft.Control := Result;
+    lbl.AnchorSideLeft.Side := ELazAnchorSideReference.Top;
+    lbl.Anchors := [ELazAnchorKind.Bottom, ELazAnchorKind.Left];
+  end;
+
+  if hint <> '' then
+  begin
+    Result.Hint := hint;
+    Result.ShowHint := True;
+  end;
+end;
+
+
 function TImageBox.CreateEx(owner: Pointer): TImageBox; static;
 begin
   Result := TImageBox.Create(TLazControl(owner));

utils/forms/scriptform.simba

@@ -146,8 +146,9 @@ begin
 
   Self.PageControl := TLazPageControl.CreateEx(Self.Form);
   Self.PageControl.Align := ELazAlign.Client;
-  Self.PageControl.Width := 800;
-  Self.PageControl.Height := 570;
+
+  Self.PageControl.Width := Self.Form.Width;
+  Self.PageControl.Height := Self.Form.Height - 40;
 
   panel := TLazPanel.CreateEx(Self.Form);
   panel.Align := ELazAlign.Bottom;
@@ -156,7 +157,7 @@ begin
   ProfileForm.SetupUI(panel);
 
   // Start button
-  Self.Start := TLazButton.CreateEx(panel, 'Start', '', 0, 0, Floor(80 * FormUtils.Scale));
+  Self.Start := TLazButton.CreateEx(panel, 'Start', '', 0, 0, 80, 30);
   Self.Start.Align := ELazAlign.Right;
   Self.Start.OnClick := @Self.OnStart;
   Self.Start.BorderSpacing.Top    := 3;
@@ -194,16 +195,11 @@ end.
 ```
 *)
 function TScriptForm.CreateTab(caption: String): TLazTabSheet;
-var
-  w, h: Integer;
 begin
-  w := Round(Self.PageControl.Width / FormUtils.Scale);
-  h := Round(Self.PageControl.Height / FormUtils.Scale);
-
   Result := Self.PageControl.AddTab();
   Result.Caption := caption;
-  Result.Width := w;
-  Result.Height := h;
+  Result.Width := Self.PageControl.Width;
+  Result.Height := Self.PageControl.Height;
 
   Self.PageControl.ActiveTabIndex := 0;
 end;