diff --git a/test/bugs/822/bug822.lpi b/test/bugs/822/bug822.lpi
index 315e5c11c9..863f90e60f 100644
--- a/test/bugs/822/bug822.lpi
+++ b/test/bugs/822/bug822.lpi
@@ -4,14 +4,13 @@
+
+
-
-
-
@@ -30,12 +29,11 @@
-
+
-
@@ -43,205 +41,12 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/test/bugs/822/unit1.lfm b/test/bugs/822/unit1.lfm
index bf42e86dfd..fabefcd35a 100644
--- a/test/bugs/822/unit1.lfm
+++ b/test/bugs/822/unit1.lfm
@@ -5,7 +5,17 @@ object Form1: TForm1
Width = 400
HorzScrollBar.Page = 399
VertScrollBar.Page = 299
+ ActiveControl = ScrollBar1
Caption = 'Form1'
+ object Label1: TLabel
+ Left = 21
+ Height = 14
+ Top = 9
+ Width = 32
+ Caption = 'Label1'
+ Color = clNone
+ ParentColor = False
+ end
object ScrollBar1: TScrollBar
Left = 160
Height = 201
@@ -22,7 +32,7 @@ object Form1: TForm1
HintShortCuts = True
ShowHint = True
OnIdle = ApplicationProperties1Idle
- left = 39
- top = 29
+ left = 24
+ top = 72
end
end
diff --git a/test/bugs/822/unit1.lrs b/test/bugs/822/unit1.lrs
index 0485511509..33f4d1a3f4 100644
--- a/test/bugs/822/unit1.lrs
+++ b/test/bugs/822/unit1.lrs
@@ -2,11 +2,13 @@
LazarusResources.Add('TForm1','FORMDATA',[
'TPF0'#6'TForm1'#5'Form1'#4'Left'#3'"'#1#6'Height'#3','#1#3'Top'#3#175#0#5'Wi'
- +'dth'#3#144#1#18'HorzScrollBar.Page'#3#143#1#18'VertScrollBar.Page'#3'+'#1#7
- +'Caption'#6#5'Form1'#0#10'TScrollBar'#10'ScrollBar1'#4'Left'#3#160#0#6'Heigh'
- +'t'#3#201#0#3'Top'#2'('#5'Width'#2#17#4'Kind'#7#10'sbVertical'#8'TabOrder'#2
- +#0#0#0#22'TApplicationProperties'#22'ApplicationProperties1'#17'CaptureExcep'
- +'tions'#9#9'HintColor'#7#8'clInfoBk'#13'HintHidePause'#3#196#9#9'HintPause'#3
- +#244#1#13'HintShortCuts'#9#8'ShowHint'#9#6'OnIdle'#7#26'ApplicationPropertie'
- +'s1Idle'#4'left'#2''''#3'top'#2#29#0#0#0
+ +'dth'#3#144#1#18'HorzScrollBar.Page'#3#143#1#18'VertScrollBar.Page'#3'+'#1#13
+ +'ActiveControl'#7#10'ScrollBar1'#7'Caption'#6#5'Form1'#0#6'TLabel'#6'Label1'
+ +#4'Left'#2#21#6'Height'#2#14#3'Top'#2#9#5'Width'#2' '#7'Caption'#6#6'Label1'
+ +#5'Color'#7#6'clNone'#11'ParentColor'#8#0#0#10'TScrollBar'#10'ScrollBar1'#4
+ +'Left'#3#160#0#6'Height'#3#201#0#3'Top'#2'('#5'Width'#2#17#4'Kind'#7#10'sbVe'
+ +'rtical'#8'TabOrder'#2#0#0#0#22'TApplicationProperties'#22'ApplicationProper'
+ +'ties1'#17'CaptureExceptions'#9#9'HintColor'#7#8'clInfoBk'#13'HintHidePause'
+ +#3#196#9#9'HintPause'#3#244#1#13'HintShortCuts'#9#8'ShowHint'#9#6'OnIdle'#7
+ +#26'ApplicationProperties1Idle'#4'left'#2#24#3'top'#2'H'#0#0#0
]);
diff --git a/test/bugs/822/unit1.pas b/test/bugs/822/unit1.pas
index f765b19d46..b01f7fba85 100644
--- a/test/bugs/822/unit1.pas
+++ b/test/bugs/822/unit1.pas
@@ -14,6 +14,7 @@ type
TForm1 = class(TForm)
ApplicationProperties1: TApplicationProperties;
+ Label1: TLabel;
ScrollBar1: TScrollBar;
procedure ApplicationProperties1Idle(Sender: TObject; var Done: Boolean);
private
@@ -31,11 +32,16 @@ implementation
procedure TForm1.ApplicationProperties1Idle(Sender: TObject; var Done: Boolean);
begin
+ Label1.Caption :=
+ format('ScrollBar1.Width: %d%sGetSystemMetrics(SM_CXVSCROLL): %d',
+ [ScrollBar1.Width, LineEnding, GetSystemMetrics(SM_CXVSCROLL)]);
if paramstr(1)='--runtest' then begin
if ScrollBar1.Width = GetSystemMetrics(SM_CXVSCROLL) then
- writeln('ScrollBar1.Width = GetSystemMetrics(SM_CXVSCROLL)')
+ writeln('ScrollBar1.Width = GetSystemMetrics(SM_CXVSCROLL) = ')
else
- writeln('ScrollBar1.Width <> GetSystemMetrics(SM_CXVSCROLL)');
+ writeln(
+ format('ScrollBar1.Width (%d) <> GetSystemMetrics(SM_CXVSCROLL) (%d)',
+ [ScrollBar1.Width, GetSystemMetrics(SM_CXVSCROLL)]));
writeln('ScrollBar1.Height: ', ScrollBar1.Height);
Close;
end;