Skip to content

Commit 48cdeb4

Browse files
author
Tim Sinaeve
committed
Layout changes for HighDPI support.
1 parent de161f3 commit 48cdeb4

16 files changed

+2002
-464
lines changed

‎LogViewer.Dashboard.View.dfm

+6-2
Original file line numberDiff line numberDiff line change
@@ -68,6 +68,7 @@ object frmDashboard: TfrmDashboard
6868
object tsWinIpc: TKTabSheet
6969
Caption = 'WinIPC'
7070
ExplicitWidth = 315
71+
ExplicitHeight = 0
7172
object lblWinIPC: TLabel
7273
AlignWithMargins = True
7374
Left = 3
@@ -115,6 +116,7 @@ object frmDashboard: TfrmDashboard
115116
object tsWinOds: TKTabSheet
116117
Caption = 'WinODS'
117118
ExplicitWidth = 315
119+
ExplicitHeight = 0
118120
object lblWinods: TLabel
119121
AlignWithMargins = True
120122
Left = 3
@@ -173,14 +175,14 @@ object frmDashboard: TfrmDashboard
173175
Left = 0
174176
Top = 25
175177
Width = 314
176-
Height = 874
178+
Height = 891
177179
Align = alTop
178180
Anchors = [akLeft, akTop, akRight, akBottom]
179181
BevelOuter = bvNone
180182
ParentColor = True
181183
TabOrder = 0
182184
ExplicitWidth = 313
183-
ExplicitHeight = 857
185+
ExplicitHeight = 874
184186
end
185187
object pnlZeroMQTitle: TPanel
186188
Left = 0
@@ -271,6 +273,7 @@ object frmDashboard: TfrmDashboard
271273
object tsFileSystem: TKTabSheet
272274
Caption = 'FileSystem'
273275
ExplicitWidth = 315
276+
ExplicitHeight = 0
274277
object pnlFileSystemTitle: TPanel
275278
Left = 0
276279
Top = 0
@@ -302,6 +305,7 @@ object frmDashboard: TfrmDashboard
302305
object tsComPort: TKTabSheet
303306
Caption = 'COM port'
304307
ExplicitWidth = 315
308+
ExplicitHeight = 0
305309
object pnlComPorts: TPanel
306310
Left = 0
307311
Top = 25

‎LogViewer.Dashboard.View.pas

+23-23
Original file line numberDiff line numberDiff line change
@@ -1059,84 +1059,84 @@ procedure TfrmDashboard.InitializeTreeView;
10591059
with Header.Columns.Add do
10601060
begin
10611061
Color := clWhite;
1062-
MaxWidth := 800;
1063-
MinWidth := 100;
1062+
MaxWidth := ScaleSize(800);
1063+
MinWidth := ScaleSize(100);
10641064
Options := [coAllowClick, coEnabled, coParentBidiMode, coResizable,
10651065
coVisible, coSmartResize, coAllowFocus];
10661066
Position := COLUMN_SOURCENAME;
1067-
Indent := 8;
1068-
Width := 100;
1067+
Indent := ScaleSize(8);
1068+
Width := ScaleSize(100);
10691069
Text := SName;
10701070
end;
10711071
with Header.Columns.Add do
10721072
begin
1073-
MaxWidth := 400;
1074-
MinWidth := 150;
1073+
MaxWidth := ScaleSize(400);
1074+
MinWidth := ScaleSize(150);
10751075
Options := [coAllowClick, coEnabled, coParentBidiMode, coResizable,
10761076
coVisible, coSmartResize, coAllowFocus];
10771077
Position := COLUMN_KEY;
1078-
Width := 200;
1078+
Width := ScaleSize(200);
10791079
Text := SValue;
10801080
end;
10811081
with Header.Columns.Add do
10821082
begin
1083-
MaxWidth := 80;
1084-
MinWidth := 80;
1083+
MaxWidth := ScaleSize(80);
1084+
MinWidth := ScaleSize(80);
10851085
Options := [coAllowClick, coEnabled, coParentBidiMode, coVisible,
10861086
coAutoSpring, coAllowFocus];
10871087
Position := COLUMN_SOURCEID;
1088-
Width := 80;
1088+
Width := ScaleSize(80);
10891089
Alignment := taCenter;
10901090
Text := SId;
10911091
end;
10921092
with Header.Columns.Add do
10931093
begin
1094-
MaxWidth := 90;
1095-
MinWidth := 90;
1094+
MaxWidth := ScaleSize(90);
1095+
MinWidth := ScaleSize(90);
10961096
Options := [coAllowClick, coEnabled, coParentBidiMode,
10971097
coVisible, coAllowFocus];
10981098
Position := COLUMN_MESSAGECOUNT;
1099-
Width := 90;
1099+
Width := ScaleSize(90);
11001100
Alignment := taCenter;
11011101
Text := SMessageCount;
11021102
end;
11031103
with Header.Columns.Add do
11041104
begin
1105-
MaxWidth := 80;
1106-
MinWidth := 80;
1105+
MaxWidth := ScaleSize(80);
1106+
MinWidth := ScaleSize(80);
11071107
Options := [coAllowClick, coEnabled, coParentBidiMode,
11081108
coVisible, coAllowFocus];
11091109
Position := COLUMN_BYTES_RECEIVED;
1110-
Width := 80;
1110+
Width := ScaleSize(80);
11111111
Alignment := taCenter;
11121112
Text := SBytesReceived;
11131113
end;
11141114
with Header.Columns.Add do
11151115
begin
1116-
MaxWidth := 120;
1117-
MinWidth := 120;
1116+
MaxWidth := ScaleSize(120);
1117+
MinWidth := ScaleSize(120);
11181118
Options := [coAllowClick, coEnabled, coParentBidiMode, coVisible,
11191119
coAllowFocus];
11201120
Position := COLUMN_TIMESTAMP_FIRST;
1121-
Width := 120;
1121+
Width := ScaleSize(120);
11221122
Text := STimeStampFirst;
11231123
end;
11241124
with Header.Columns.Add do
11251125
begin
1126-
MaxWidth := 120;
1127-
MinWidth := 120;
1126+
MaxWidth := ScaleSize(120);
1127+
MinWidth := ScaleSize(120);
11281128
Options := [coAllowClick, coEnabled, coParentBidiMode,
11291129
coVisible, coAllowFocus];
11301130
Position := COLUMN_TIMESTAMP_LAST;
1131-
Width := 120;
1131+
Width := ScaleSize(120);
11321132
Text := STimeStampLast;
11331133
end;
11341134
Header.MainColumn := 0;
11351135
TreeOptions.AutoOptions := TreeOptions.AutoOptions + [toAutoSpanColumns];
11361136
TreeOptions.PaintOptions := TreeOptions.PaintOptions + [toShowTreeLines];
11371137
end;
11381138
FTreeView.Header.AutoSizeIndex := 0;
1139-
FTreeView.Indent := 30;
1139+
FTreeView.Indent := ScaleSize(30);
11401140
end;
11411141

11421142
{ Called when actions in the manager need to be updated. }

‎LogViewer.Factories.Toolbars.pas

+2-2
Original file line numberDiff line numberDiff line change
@@ -192,7 +192,7 @@ function TLogViewerToolbarsFactory.CreateMainToolbar(AOwner: TComponent;
192192
TB := TToolBar.Create(AOwner);
193193
ApplyDefaultProperties(TB);
194194
TB.Parent := AParent;
195-
TB.Images := FActions.ActionList.Images;
195+
//TB.Images := FActions.ActionList.Images;
196196
TB.ButtonWidth := 10;
197197
TB.AllowTextButtons := True;
198198
CreateToolButton(TB, 'actDashboard', tbsTextButton);
@@ -225,7 +225,7 @@ function TLogViewerToolbarsFactory.CreateRightTopToolbar(AOwner: TComponent;
225225
TB := TToolBar.Create(AOwner);
226226
ApplyDefaultProperties(TB);
227227
TB.Parent := AParent;
228-
TB.Images := FActions.ActionList.Images;
228+
// TB.Images := FActions.ActionList.Images;
229229
TB.ButtonWidth := 10;
230230
TB.AllowTextButtons := True;
231231
CreateToolButton(TB, 'actAbout');

‎LogViewer.Image.View.dfm

+41-84
Original file line numberDiff line numberDiff line change
@@ -1,45 +1,32 @@
11
object frmImageView: TfrmImageView
22
Left = 0
33
Top = 0
4-
Margins.Left = 5
5-
Margins.Top = 5
6-
Margins.Right = 5
7-
Margins.Bottom = 5
8-
ClientHeight = 1364
9-
ClientWidth = 1032
4+
ClientHeight = 909
5+
ClientWidth = 684
106
Color = clWhite
117
DoubleBuffered = True
128
Font.Charset = DEFAULT_CHARSET
139
Font.Color = clWindowText
14-
Font.Height = -17
10+
Font.Height = -11
1511
Font.Name = 'Segoe UI'
1612
Font.Style = []
1713
ShowHint = True
18-
PixelsPerInch = 144
19-
TextHeight = 23
14+
TextHeight = 13
2015
object edtPixelFormat: TLabeledEdit
21-
Left = 455
22-
Top = 5
23-
Width = 109
24-
Height = 25
25-
Margins.Left = 5
26-
Margins.Top = 5
27-
Margins.Right = 5
28-
Margins.Bottom = 5
16+
Left = 303
17+
Top = 3
18+
Width = 73
19+
Height = 17
2920
Alignment = taCenter
3021
BevelOuter = bvNone
3122
BevelKind = bkFlat
3223
BorderStyle = bsNone
33-
EditLabel.Width = 95
34-
EditLabel.Height = 25
35-
EditLabel.Margins.Left = 5
36-
EditLabel.Margins.Top = 5
37-
EditLabel.Margins.Right = 5
38-
EditLabel.Margins.Bottom = 5
24+
EditLabel.Width = 63
25+
EditLabel.Height = 17
3926
EditLabel.Caption = 'Pixel format:'
4027
Font.Charset = DEFAULT_CHARSET
4128
Font.Color = clWindowText
42-
Font.Height = -17
29+
Font.Height = -11
4330
Font.Name = 'Segoe UI'
4431
Font.Style = [fsBold]
4532
LabelPosition = lpLeft
@@ -49,28 +36,20 @@ object frmImageView: TfrmImageView
4936
Text = ''
5037
end
5138
object edtHandleType: TLabeledEdit
52-
Left = 672
53-
Top = 5
54-
Width = 110
55-
Height = 25
56-
Margins.Left = 5
57-
Margins.Top = 5
58-
Margins.Right = 5
59-
Margins.Bottom = 5
39+
Left = 448
40+
Top = 3
41+
Width = 73
42+
Height = 17
6043
Alignment = taCenter
6144
BevelOuter = bvNone
6245
BevelKind = bkFlat
6346
BorderStyle = bsNone
64-
EditLabel.Width = 96
65-
EditLabel.Height = 25
66-
EditLabel.Margins.Left = 5
67-
EditLabel.Margins.Top = 5
68-
EditLabel.Margins.Right = 5
69-
EditLabel.Margins.Bottom = 5
47+
EditLabel.Width = 65
48+
EditLabel.Height = 17
7049
EditLabel.Caption = 'Handle type:'
7150
Font.Charset = DEFAULT_CHARSET
7251
Font.Color = clWindowText
73-
Font.Height = -17
52+
Font.Height = -11
7453
Font.Name = 'Segoe UI'
7554
Font.Style = [fsBold]
7655
LabelPosition = lpLeft
@@ -80,28 +59,20 @@ object frmImageView: TfrmImageView
8059
Text = ''
8160
end
8261
object edtHeight: TLabeledEdit
83-
Left = 240
84-
Top = 5
85-
Width = 110
86-
Height = 25
87-
Margins.Left = 5
88-
Margins.Top = 5
89-
Margins.Right = 5
90-
Margins.Bottom = 5
62+
Left = 160
63+
Top = 3
64+
Width = 73
65+
Height = 17
9166
Alignment = taCenter
9267
BevelOuter = bvNone
9368
BevelKind = bkFlat
9469
BorderStyle = bsNone
95-
EditLabel.Width = 55
96-
EditLabel.Height = 25
97-
EditLabel.Margins.Left = 5
98-
EditLabel.Margins.Top = 5
99-
EditLabel.Margins.Right = 5
100-
EditLabel.Margins.Bottom = 5
70+
EditLabel.Width = 38
71+
EditLabel.Height = 17
10172
EditLabel.Caption = 'Height:'
10273
Font.Charset = DEFAULT_CHARSET
10374
Font.Color = clWindowText
104-
Font.Height = -17
75+
Font.Height = -11
10576
Font.Name = 'Segoe UI'
10677
Font.Style = [fsBold]
10778
LabelPosition = lpLeft
@@ -111,28 +82,20 @@ object frmImageView: TfrmImageView
11182
Text = ''
11283
end
11384
object edtWidth: TLabeledEdit
114-
Left = 60
115-
Top = 5
116-
Width = 110
117-
Height = 25
118-
Margins.Left = 5
119-
Margins.Top = 5
120-
Margins.Right = 5
121-
Margins.Bottom = 5
85+
Left = 40
86+
Top = 3
87+
Width = 73
88+
Height = 17
12289
Alignment = taCenter
12390
BevelOuter = bvNone
12491
BevelKind = bkFlat
12592
BorderStyle = bsNone
126-
EditLabel.Width = 50
127-
EditLabel.Height = 25
128-
EditLabel.Margins.Left = 5
129-
EditLabel.Margins.Top = 5
130-
EditLabel.Margins.Right = 5
131-
EditLabel.Margins.Bottom = 5
93+
EditLabel.Width = 35
94+
EditLabel.Height = 17
13295
EditLabel.Caption = 'Width:'
13396
Font.Charset = DEFAULT_CHARSET
13497
Font.Color = clWindowText
135-
Font.Height = -17
98+
Font.Height = -11
13699
Font.Name = 'Segoe UI'
137100
Font.Style = [fsBold]
138101
LabelPosition = lpLeft
@@ -143,13 +106,9 @@ object frmImageView: TfrmImageView
143106
end
144107
object sbxMain: TScrollBox
145108
Left = 0
146-
Top = 32
147-
Width = 1032
148-
Height = 1332
149-
Margins.Left = 5
150-
Margins.Top = 5
151-
Margins.Right = 5
152-
Margins.Bottom = 5
109+
Top = 21
110+
Width = 684
111+
Height = 888
153112
HorzScrollBar.Smooth = True
154113
HorzScrollBar.Tracking = True
155114
VertScrollBar.Smooth = True
@@ -162,15 +121,13 @@ object frmImageView: TfrmImageView
162121
Color = clWhite
163122
ParentColor = False
164123
TabOrder = 4
124+
ExplicitWidth = 678
125+
ExplicitHeight = 871
165126
object imgBitmap: TImage
166-
Left = 5
167-
Top = 5
168-
Width = 1014
169-
Height = 877
170-
Margins.Left = 5
171-
Margins.Top = 5
172-
Margins.Right = 5
173-
Margins.Bottom = 5
127+
Left = 3
128+
Top = 3
129+
Width = 676
130+
Height = 585
174131
AutoSize = True
175132
Center = True
176133
IncrementalDisplay = True

0 commit comments

Comments
 (0)