Changeset 166 for trunk

Timestamp:

Jan 19, 2018, 10:32:39 AM (7 years ago)

Author:

chronos

Message:

• Fixed: Main toolbar DPI scaling.

Location:

trunk

Files:

• Forms (modified) (1 prop)
• Forms/UFormMain.lfm (modified) (7 diffs)
• Forms/UFormMain.pas (modified) (2 diffs)
• Packages/Common/UScaleDPI.pas (modified) (2 diffs)
• Read Me.txt (added)

trunk/Forms/UFormMain.lfm

@@ -66 +66 @@
   object PanelParam: TPanel
     Left = 0
-    Height = 38
-    Top = 32
+    Height = 32
+    Top = 38
     Width = 998
     Align = alTop
     BevelOuter = bvNone
-    ClientHeight = 38
+    ClientHeight = 32
     ClientWidth = 998
     TabOrder = 1
@@ -101 +101 @@
   object CoolBar1: TCoolBar
     Left = 0
-    Height = 32
+    Height = 38
     Top = 0
     Width = 998
@@ -108 +108 @@
       item
         Break = False
-        Control = ToolBar1
+        Control = ToolBarFile
         FixedSize = True
         MinWidth = 40
-        Width = 136
+        Width = 164
       end    
       item
         Break = False
-        Control = ToolBar2
+        Control = ToolBarManage
         FixedSize = True
         MinWidth = 40
-        Width = 126
+        Width = 149
       end    
       item
         Break = False
-        Control = ToolBar3
+        Control = ToolBarOther
         FixedSize = True
         MinWidth = 40
-        Width = 80
+        Width = 91
       end    
       item
         Break = False
-        Control = ToolBar4
+        Control = ToolBarFilter
         FixedSize = True
         MinWidth = 40
-        Width = 80
+        Width = 120
       end>
     Images = Core.ImageList1
-    object ToolBar1: TToolBar
+    object ToolBarFile: TToolBar
       AnchorSideLeft.Control = CoolBar1
       AnchorSideTop.Control = CoolBar1
@@ -141 +141 @@
       Height = 28
       Top = 5
-      Width = 132
+      Width = 135
       Align = alNone
       AutoSize = True
@@ -177 +177 @@
       end
     end
-    object ToolBar2: TToolBar
+    object ToolBarManage: TToolBar
       AnchorSideLeft.Control = CoolBar1
       AnchorSideTop.Control = CoolBar1
-      Left = 160
+      Left = 188
       Height = 28
       Top = 5
-      Width = 117
+      Width = 120
       Align = alNone
       AutoSize = True
-      BorderSpacing.Left = 158
+      BorderSpacing.Left = 186
       BorderSpacing.Top = 3
       EdgeBorders = []
@@ -217 +217 @@
       end
     end
-    object ToolBar3: TToolBar
+    object ToolBarOther: TToolBar
       AnchorSideLeft.Control = CoolBar1
       AnchorSideTop.Control = CoolBar1
-      Left = 286
+      Left = 337
       Height = 28
       Top = 5
-      Width = 59
+      Width = 62
       Align = alNone
       AutoSize = True
-      BorderSpacing.Left = 284
+      BorderSpacing.Left = 335
       BorderSpacing.Top = 3
       EdgeBorders = []
@@ -247 +247 @@
       end
     end
-    object ToolBar4: TToolBar
+    object ToolBarFilter: TToolBar
       AnchorSideLeft.Control = CoolBar1
       AnchorSideTop.Control = CoolBar1
-      Left = 366
+      Left = 428
       Height = 28
       Top = 5
-      Width = 88
+      Width = 91
       Align = alNone
       AutoSize = True
-      BorderSpacing.Left = 364
+      BorderSpacing.Left = 426
       BorderSpacing.Top = 3
       EdgeBorders = []

trunk/Forms/UFormMain.pas

@@ -80 +80 @@
     SaveDialog1: TSaveDialog;
     StatusBar1: TStatusBar;
-    ToolBar1: TToolBar;
-    ToolBar2: TToolBar;
-    ToolBar3: TToolBar;
-    ToolBar4: TToolBar;
+    ToolBarFile: TToolBar;
+    ToolBarManage: TToolBar;
+    ToolBarOther: TToolBar;
+    ToolBarFilter: TToolBar;
     ToolButton1: TToolButton;
     ToolButton11: TToolButton;
@@ -189 +189 @@
   I: Integer;
 begin
-  for I := 0 to ToolBar1.ButtonCount - 1 do
-    ToolBar1.Buttons[I].Hint := ToolBar1.Buttons[I].Caption;
-  for I := 0 to ToolBar2.ButtonCount - 1 do
-    ToolBar2.Buttons[I].Hint := ToolBar2.Buttons[I].Caption;
-  for I := 0 to ToolBar3.ButtonCount - 1 do
-    ToolBar3.Buttons[I].Hint := ToolBar3.Buttons[I].Caption;
-  for I := 0 to ToolBar4.ButtonCount - 1 do
-    ToolBar4.Buttons[I].Hint := ToolBar4.Buttons[I].Caption;
+  for I := 0 to ToolBarFile.ButtonCount - 1 do
+    ToolBarFile.Buttons[I].Hint := ToolBarFile.Buttons[I].Caption;
+  for I := 0 to ToolBarManage.ButtonCount - 1 do
+    ToolBarManage.Buttons[I].Hint := ToolBarManage.Buttons[I].Caption;
+  for I := 0 to ToolBarOther.ButtonCount - 1 do
+    ToolBarOther.Buttons[I].Hint := ToolBarOther.Buttons[I].Caption;
+  for I := 0 to ToolBarFilter.ButtonCount - 1 do
+    ToolBarFilter.Buttons[I].Hint := ToolBarFilter.Buttons[I].Caption;
   PanelMain.ControlStyle := PanelMain.ControlStyle + [csOpaque];
   PanelParam.ControlStyle := PanelParam.ControlStyle + [csOpaque];

trunk/Packages/Common/UScaleDPI.pas

@@ -284 +284 @@
   WinControl: TWinControl;
   ToolBarControl: TToolBar;
-  OldAnchors: TAnchors;
-  OldAutoSize: Boolean;
+  //OldAnchors: TAnchors;
+  //OldAutoSize: Boolean;
 begin
   //if Control is TMemo then Exit;
@@ -316 +316 @@
         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);
+    end;
     EndUpdate;
   end;