paweld/lazarus
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/lazarus/lazarus.git synced 2025-08-20 01:29:30 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merged revision(s) 51334 #4c08c761dc, 51359 #685cfd6bbc, 51361 #871f631591 from trunk:

Browse Source 
LCL: don't prevent AutoSizeDelayedHandle for minimized windows. Issue #29445
........
LCL: fixed crash with sparta docked , added check for Target <> nil in SetFocusedControl.
........
LCL: Don't turn TScrollBar.Visible False when changing Kind property. AScrollBar.Show did not work due to flag tests. Issue #29422
........

git-svn-id: branches/fixes_1_6@51515 -
This commit is contained in:
maxim 2016-02-06 14:00:56 +00:00
parent c5e0a33841
commit 314291368a
2 changed files with 2 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
lcl/include/customform.inc
View File

@ -2226,8 +2226,6 @@ end;
------------------------------------------------------------------------------} ------------------------------------------------------------------------------}
function TCustomForm.AutoSizeDelayedHandle: Boolean; function TCustomForm.AutoSizeDelayedHandle: Boolean;
begin begin
if WindowState=wsMinimized then
exit(true);
if (Parent<>nil) or (ParentWindow<>0) then if (Parent<>nil) or (ParentWindow<>0) then
// this form is inlined / embedded it works like a normal TWinControl // this form is inlined / embedded it works like a normal TWinControl
Result:=inherited AutoSizeDelayedHandle Result:=inherited AutoSizeDelayedHandle
@ -2309,7 +2307,7 @@ function TCustomForm.SetFocusedControl(Control: TWinControl): Boolean;
function NextChildControl(CurParent, Target: TWinControl): TWinControl; inline; function NextChildControl(CurParent, Target: TWinControl): TWinControl; inline;
begin begin
while Target.Parent <> CurParent do while (Target <> nil) and (Target.Parent <> CurParent) do
Target := Target.Parent; Target := Target.Parent;
Result := Target; Result := Target;
end; end;

12
lcl/interfaces/gtk2/gtk2wsstdctrls.pp
View File

@ -2686,20 +2686,10 @@ end;
class procedure TGtk2WSScrollBar.SetKind(const AScrollBar: TCustomScrollBar; class procedure TGtk2WSScrollBar.SetKind(const AScrollBar: TCustomScrollBar;
const AIsHorizontal: Boolean); const AIsHorizontal: Boolean);
var
B: Boolean;
begin begin
if not AScrollBar.HandleAllocated then if not AScrollBar.HandleAllocated then
exit; exit;
B := AScrollBar.Visible; RecreateWnd(AScrollBar);
if B then
AScrollBar.Hide;
try
RecreateWnd(AScrollBar);
finally
if B then
AScrollBar.Show;
end;
end; end;
class procedure TGtk2WSScrollBar.SetParams(const AScrollBar: TCustomScrollBar); class procedure TGtk2WSScrollBar.SetParams(const AScrollBar: TCustomScrollBar);