Changeset 467

Timestamp:

Dec 4, 2014, 5:19:20 PM (10 years ago)

Author:

chronos

Message:

• Fixed: TScaleDPI can now also use lower DPI then original.
• Fixed: TScaleDPI DPI can be different for horizontal and vertical direction.
• Modified: Register TScaleDPI as design component to Common group.

Location:

Common

Files:

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

Common/Common.lpk

@@ -12 +12 @@
         <UnitOutputDirectory Value="lib\$(TargetCPU)-$(TargetOS)"/>
       </SearchPaths>
-      <Other>
-        <CompilerMessages>
-          <UseMsgFile Value="True"/>
-        </CompilerMessages>
-        <CompilerPath Value="$(CompPath)"/>
-      </Other>
     </CompilerOptions>
     <Description Value="Various libraries"/>
     <License Value="GNU/GPL"/>
     <Version Minor="7"/>
-    <Files Count="19">
+    <Files Count="20">
       <Item1>
         <Filename Value="StopWatch.pas"/>
@@ -106 +100 @@
         <UnitName Value="UFindFile"/>
       </Item19>
+      <Item20>
+        <Filename Value="UScaleDPI.pas"/>
+        <HasRegisterProc Value="True"/>
+        <UnitName Value="UScaleDPI"/>
+      </Item20>
     </Files>
     <i18n>

Common/Common.pas

@@ -11 +11 @@
   UMemory, UResetableThread, UPool, ULastOpenedList, URegistry, 
   UJobProgressView, UXMLUtils, UApplicationInfo, USyncCounter, UListViewSort, 
-  UPersistentForm, UFindFile, LazarusPackageIntf;
+  UPersistentForm, UFindFile, UScaleDPI, LazarusPackageIntf;
 
 implementation

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);