paweld/lazarus
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/lazarus/lazarus.git synced 2025-04-06 22:18:15 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merged revision(s) 50870 #c95d982d72, 50942 #dfebe2190c from trunk:

Browse Source 
LCL: toolbutton: fix down states. Issue #28286. Modified patch by Derit Agustin
........
LCL: Adjust Width and Height when setting Contraints. Issue #28654.
........

git-svn-id: branches/fixes_1_6@50973 -
This commit is contained in:
maxim 2015-12-21 22:48:41 +00:00
parent 131530409b
commit 3de212671e
2 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lcl/include/control.inc
View File

@ -1372,6 +1372,8 @@ end;
------------------------------------------------------------------------------}
procedure TControl.DoConstraintsChange(Sender : TObject);
begin
Width:=Constraints.MinMaxWidth(Width);
Height:=Constraints.MinMaxHeight(Height);
AdjustSize;
end;

12
lcl/include/toolbutton.inc
View File

@ -903,17 +903,19 @@ begin
begin
if Down then
begin // checked states
if FMouseInControl then
if (tbfPressed in FToolButtonFlags) and FMouseInControl then
inc(ToolDetail, 2) // ttbButtonPressed
else if FMouseInControl then
inc(ToolDetail, 5) // ttbButtonCheckedHot
else
inc(ToolDetail, 4) // ttbButtonChecked
inc(ToolDetail, 4);// ttbButtonChecked
end
else
begin
if (tbfPressed in FToolButtonFlags) and FMouseInControl then
inc(ToolDetail, 2) else // ttbButtonPressed
if FMouseInControl then
inc(ToolDetail, 1); // ttbButtonHot
inc(ToolDetail, 2) // ttbButtonPressed
else if FMouseInControl then
inc(ToolDetail, 1);// ttbButtonHot
end;
end;
Result := ThemeServices.GetElementDetails(ToolDetail);