Changeset 61 for trunk/Packages/Common

Timestamp:

Dec 4, 2014, 11:26:54 AM (10 years ago)

Author:

chronos

Message:

• Added: Unit project which should handle all project related operations.
• Fixed: TScaleDPI to handle also lower then default DPI and different horizontal and vertical DPI.

Location:

trunk/Packages/Common

Files:

• Common.lpk (modified) (1 diff)
• Common.pas (modified) (1 diff)
• UScaleDPI.pas (modified) (6 diffs)

trunk/Packages/Common/Common.lpk

@@ -102 +102 @@
       <Item20>
         <Filename Value="UScaleDPI.pas"/>
+        <HasRegisterProc Value="True"/>
         <UnitName Value="UScaleDPI"/>
       </Item20>

trunk/Packages/Common/Common.pas

@@ -24 +24 @@
   RegisterUnit('UPersistentForm', @UPersistentForm.Register);
   RegisterUnit('UFindFile', @UFindFile.Register);
+  RegisterUnit('UScaleDPI', @UScaleDPI.Register);
 end;
 

trunk/Packages/Common/UScaleDPI.pas

@@ -14 +14 @@
   { TScaleDPI }
 
-  TScaleDPI = class
+  TScaleDPI = class(TComponent)
   private
     FAutoDetect: Boolean;
@@ -27 +27 @@
     function ScaleX(Size: Integer; FromDPI: Integer): Integer;
     function ScaleY(Size: Integer; FromDPI: Integer): Integer;
-    constructor Create;
+    constructor Create(AOwner: TComponent);
+  published
     property AutoDetect: Boolean read FAutoDetect write SetAutoDetect;
   end;
 
+procedure Register;
 
 implementation
+
+procedure Register;
+begin
+  RegisterComponents('Common', [TScaleDPI]);
+end;
 
 procedure TScaleDPI.SetAutoDetect(AValue: Boolean);
@@ -59 +66 @@
   I: Integer;
 begin
-  if (DPI.X <= FromDPI.X * 1.1) or (DPI.Y <= FromDPI.Y * 1.1) then Exit;
-
   NewWidth := ScaleX(ImgList.Width, FromDPI.X);
   NewHeight := ScaleY(ImgList.Height, FromDPI.Y);
@@ -97 +102 @@
 function TScaleDPI.ScaleX(Size: Integer; FromDPI: Integer): Integer;
 begin
-  if DPI.X <= FromDPI then
-    Result := Size
-  else
-    Result := MulDiv(Size, DPI.X, FromDPI);
+  Result := MulDiv(Size, DPI.X, FromDPI);
 end;
 
 function TScaleDPI.ScaleY(Size: Integer; FromDPI: Integer): Integer;
 begin
-  if Screen.PixelsPerInch <= FromDPI then
-    Result := Size
-  else
-    Result := MulDiv(Size, DPI.Y, FromDPI);
+  Result := MulDiv(Size, DPI.Y, FromDPI);
 end;
 
@@ -117 +116 @@
 end;
 
-constructor TScaleDPI.Create;
+constructor TScaleDPI.Create(AOwner: TComponent);
 begin
+  inherited;
   DPI := Point(96, 96);
   DesignDPI := Point(96, 96);
@@ -129 +129 @@
   ToolBarControl: TToolBar;
 begin
-  if (DPI.X <= FromDPI.X) or (DPI.Y <= FromDPI.Y) then Exit;
-
   with Control do begin
     Left := ScaleX(Left, FromDPI.X);