Changeset 106 for trunk

Timestamp:

Oct 11, 2016, 4:13:32 PM (8 years ago)

Author:

chronos

Message:

Modified: Synchronized content of Common package.

Location:

trunk/Packages/Common

Files:

• UFindFile.pas (modified) (3 diffs)
• UScaleDPI.pas (modified) (8 diffs)

trunk/Packages/Common/UFindFile.pas

@@ -55 +55 @@
   end;
 
+const
+{$IFDEF WINDOWS}
+  FilterAll = '*.*';
+{$ENDIF}
+{$IFDEF LINUX}
+  FilterAll = '*';
+{$ENDIF}
+
 procedure Register;
 
@@ -71 +79 @@
   inherited Create(AOwner);
   Path := IncludeTrailingBackslash(UTF8Encode(GetCurrentDir));
-  FileMask := '*.*';
+  FileMask := FilterAll;
   FileAttr := [ffaAnyFile];
   s := TStringList.Create;
@@ -127 +135 @@
   If not InSubFolders then Exit;
 
-  if SysUtils.FindFirst(UTF8Decode(inPath + '*.*'), faDirectory, Rec) = 0 then
+  if SysUtils.FindFirst(UTF8Decode(inPath + FilterAll), faDirectory, Rec) = 0 then
   try
     repeat

trunk/Packages/Common/UScaleDPI.pas

@@ -17 +17 @@
   TControlDimension = class
     BoundsRect: TRect;
-    AuxSize: TPoint;
     FontHeight: Integer;
     Controls: TObjectList; // TList<TControlDimension>
+    // Class specifics
+    ButtonSize: TPoint; // TToolBar
+    CoolBandWidth: Integer;
+    ConstraintsMin: TPoint; // TForm
+    ConstraintsMax: TPoint; // TForm
     constructor Create;
     destructor Destroy; override;
@@ -74 +78 @@
 destructor TControlDimension.Destroy;
 begin
-  Controls.Free;
+  FreeAndNil(Controls);
   inherited Destroy;
 end;
@@ -113 +117 @@
   Dimensions.Controls.Clear;
   if Control is TToolBar then
-    Dimensions.AuxSize := Point(TToolBar(Control).ButtonWidth, TToolBar(Control).ButtonHeight);
-
+    Dimensions.ButtonSize := Point(TToolBar(Control).ButtonWidth, TToolBar(Control).ButtonHeight);
+  if Control is TForm then begin
+    Dimensions.ConstraintsMin := Point(TForm(Control).Constraints.MinWidth,
+      TForm(Control).Constraints.MinHeight);
+    Dimensions.ConstraintsMax := Point(TForm(Control).Constraints.MaxWidth,
+      TForm(Control).Constraints.MaxHeight);
+  end;
   if Control is TWinControl then
   for I := 0 to TWinControl(Control).ControlCount - 1 do begin
-    if TWinControl(Control).Controls[I] is TControl then begin
+    if TWinControl(Control).Controls[I] is TControl then
+    // Do not scale docked forms twice
+    if not (TWinControl(Control).Controls[I] is TForm) then begin
       NewControl := TControlDimension.Create;
       Dimensions.Controls.Add(NewControl);
@@ -133 +144 @@
   Control.Font.Height := Dimensions.FontHeight;
   if Control is TToolBar then begin
-    TToolBar(Control).ButtonWidth := Dimensions.AuxSize.X;
-    TToolBar(Control).ButtonHeight := Dimensions.AuxSize.Y;
+    TToolBar(Control).ButtonWidth := Dimensions.ButtonSize.X;
+    TToolBar(Control).ButtonHeight := Dimensions.ButtonSize.Y;
+  end;
+  if Control is TForm then begin
+    TForm(Control).Constraints.MinWidth := Dimensions.ConstraintsMin.X;
+    TForm(Control).Constraints.MinHeight := Dimensions.ConstraintsMin.Y;
+    TForm(Control).Constraints.MaxWidth := Dimensions.ConstraintsMax.X;
+    TForm(Control).Constraints.MaxHeight := Dimensions.ConstraintsMax.Y;
   end;
   if Control is TWinControl then
   for I := 0 to TWinControl(Control).ControlCount - 1 do begin
-    if TWinControl(Control).Controls[I] is TControl then begin
+    if TWinControl(Control).Controls[I] is TControl then
+    // Do not scale docked forms twice
+    if not (TWinControl(Control).Controls[I] is TForm) then begin
       RestoreDimensions(TWinControl(Control).Controls[I], TControlDimension(Dimensions.Controls[I]));
     end;
@@ -152 +171 @@
   Control.Font.Height := ScaleY(Dimensions.FontHeight, DesignDPI.Y);
   if Control is TToolBar then begin
-    TToolBar(Control).ButtonWidth := ScaleX(Dimensions.AuxSize.X, DesignDPI.X);
-    TToolBar(Control).ButtonHeight := ScaleY(Dimensions.AuxSize.Y, DesignDPI.Y);
+    TToolBar(Control).ButtonWidth := ScaleX(Dimensions.ButtonSize.X, DesignDPI.X);
+    TToolBar(Control).ButtonHeight := ScaleY(Dimensions.ButtonSize.Y, DesignDPI.Y);
+  end;
+  if Control is TCoolBar then begin
+    with TCoolBar(Control) do
+    for I := 0 to Bands.Count - 1 do
+    with TCoolBand(Bands[I]) do begin
+      MinWidth := ScaleX(Dimensions.ButtonSize.X, DesignDPI.X);
+      MinHeight := ScaleY(Dimensions.ButtonSize.Y, DesignDPI.Y);
+      //Width := ScaleX(Dimensions.BoundsRect.Left -
+    end;
+  end;
+  if Control is TForm then begin
+    TForm(Control).Constraints.MinWidth := ScaleX(Dimensions.ConstraintsMin.X, DesignDPI.X);
+    TForm(Control).Constraints.MaxWidth := ScaleX(Dimensions.ConstraintsMax.X, DesignDPI.X);
+    TForm(Control).Constraints.MinHeight := ScaleY(Dimensions.ConstraintsMin.Y, DesignDPI.Y);
+    TForm(Control).Constraints.MaxHeight := ScaleY(Dimensions.ConstraintsMax.Y, DesignDPI.Y);
   end;
   if Control is TWinControl then
   for I := 0 to TWinControl(Control).ControlCount - 1 do begin
-    if TWinControl(Control).Controls[I] is TControl then begin
+    if TWinControl(Control).Controls[I] is TControl then
+    // Do not scale docked forms twice
+    if not (TWinControl(Control).Controls[I] is TForm) then begin
       ScaleDimensions(TWinControl(Control).Controls[I], TControlDimension(Dimensions.Controls[I]));
     end;
@@ -183 +219 @@
 
   SetLength(Temp, ImgList.Count);
-  TempBmp := TBitmap.Create;
   for I := 0 to ImgList.Count - 1 do
   begin
+    TempBmp := TBitmap.Create;
+    TempBmp.PixelFormat := pf32bit;
     ImgList.GetBitmap(I, TempBmp);
-    //TempBmp.PixelFormat := pfDevice;
     Temp[I] := TBitmap.Create;
     Temp[I].SetSize(NewWidth, NewHeight);
-    Temp[I].TransparentColor := clFuchsia;// TempBmp.TransparentColor;
+    Temp[I].PixelFormat := pf32bit;
+    Temp[I].TransparentColor := TempBmp.TransparentColor;
     //Temp[I].TransparentMode := TempBmp.TransparentMode;
     Temp[I].Transparent := True;
@@ -199 +236 @@
     if (Temp[I].Width = 0) or (Temp[I].Height = 0) then Continue;
     Temp[I].Canvas.StretchDraw(Rect(0, 0, Temp[I].Width, Temp[I].Height), TempBmp);
-  end;
-  TempBmp.Free;
+    TempBmp.Free;
+  end;
 
   ImgList.Clear;
@@ -247 +284 @@
   WinControl: TWinControl;
   ToolBarControl: TToolBar;
-begin
-  Control.BoundsRect := ScaleRect(Control.BoundsRect, DesignDPI);
-  Control.Font.Height := ScaleY(Control.Font.Height, DesignDPI.Y);
+  OldAnchors: TAnchors;
+  OldAutoSize: Boolean;
+begin
+  //if Control is TMemo then Exit;
+  //if Control is TForm then
+  //  Control.DisableAutoSizing;
+  with Control do begin
+    //OldAutoSize := AutoSize;
+    //AutoSize := False;
+    //Anchors := [];
+    Left := ScaleX(Left, FromDPI.X);
+    Top := ScaleY(Top, FromDPI.Y);
+    //if not (akRight in Anchors) then
+    Width := ScaleX(Width, FromDPI.X);
+    //if not (akBottom in Anchors) then
+    Height := ScaleY(Height, FromDPI.Y);
+    {$IFDEF LCL Qt}
+      Font.Size := 0;
+    {$ELSE}
+      Font.Height := ScaleY(Font.GetTextHeight('Hg'), FromDPI.Y);
+    {$ENDIF}
+    //Anchors := OldAnchors;
+    //AutoSize := OldAutoSize;
+  end;
 
   if Control is TToolBar then begin