Changeset 41 for trunk/Packages/Common/UScaleDPI.pas

Timestamp:

May 8, 2019, 11:54:23 AM (5 years ago)

Author:

chronos

Message:

• Modified: Build under Lazarus 2.0.
• Modified: Used .lrj files instead of .lrt files.
• Modified: Removed TemplateGenerics package.

File:

• trunk/Packages/Common/UScaleDPI.pas (modified) (5 diffs)

trunk/Packages/Common/UScaleDPI.pas

@@ -215 +215 @@
   I: Integer;
 begin
+  ImgList.BeginUpdate;
   NewWidth := ScaleX(ImgList.Width, FromDPI.X);
   NewHeight := ScaleY(ImgList.Height, FromDPI.Y);
@@ -248 +249 @@
     Temp[i].Free;
   end;
+  ImgList.EndUpdate;
 end;
 
@@ -284 +286 @@
   WinControl: TWinControl;
   ToolBarControl: TToolBar;
-  OldAnchors: TAnchors;
-  OldAutoSize: Boolean;
-begin
+  //OldAnchors: TAnchors;
+  //OldAutoSize: Boolean;
+begin
+  //if not (Control is TCustomPage) then
+  // Resize childs first
+  if Control is TWinControl then begin
+    WinControl := TWinControl(Control);
+    if WinControl.ControlCount > 0 then begin
+      for I := 0 to WinControl.ControlCount - 1 do begin
+        if WinControl.Controls[I] is TControl then begin
+          ScaleControl(WinControl.Controls[I], FromDPI);
+        end;
+      end;
+    end;
+  end;
+
   //if Control is TMemo then Exit;
   //if Control is TForm then
@@ -316 +331 @@
         MinWidth := ScaleX(MinWidth, FromDPI.X);
         MinHeight := ScaleY(MinHeight, FromDPI.Y);
-        Width := ScaleX(Width, FromDPI.X);
+        // Workaround to bad band width auto sizing
+        //Width := ScaleX(Width, FromDPI.X);
+        Width := ScaleX(Control.Width + 28, FromDPI.X);
         //Control.Invalidate;
       end;
+    // Workaround for bad autosizing of coolbar
+    if AutoSize then begin
+      AutoSize := False;
+      Height := ScaleY(Height, FromDPI.Y);
+      AutoSize := True;
+    end;
     EndUpdate;
   end;
@@ -330 +353 @@
   end;
 
-  //if not (Control is TCustomPage) then
-  if Control is TWinControl then begin
-    WinControl := TWinControl(Control);
-    if WinControl.ControlCount > 0 then begin
-      for I := 0 to WinControl.ControlCount - 1 do begin
-        if WinControl.Controls[I] is TControl then begin
-          ScaleControl(WinControl.Controls[I], FromDPI);
-        end;
-      end;
-    end;
-  end;
   //if Control is TForm then
   //  Control.EnableAutoSizing;