paweld/lazarus
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/lazarus/lazarus.git synced 2025-12-27 07:10:32 +01:00
Code Issues Packages Projects Releases Wiki Activity

lcl: improve reordering of toolbuttons if they were added on toolbar create and their bounds are equal

Browse Source 
git-svn-id: trunk@15434 -
This commit is contained in:
paul 2008-06-16 07:06:37 +00:00
parent d5d9f4c4d6
commit e1ffc23daa
2 changed files with 31 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
lcl/include/toolbar.inc
View File

@ -36,14 +36,28 @@ begin
Row1 := (Control1.Top + HalfBtnHeight) div BtnHeight;
Row2 := (Control2.Top + HalfBtnHeight) div BtnHeight;
if Row1<Row2 then
Result:=-1
else if Row1>Row2 then
Result:=1
else if Control1.Left<Control2.Left then
Result:=-1
else if Control1.Left>Control2.Left then
Result:=1;
if Row1 < Row2 then
Result := -1
else
if Row1 > Row2 then
Result :=1
else
if Control1.Left < Control2.Left then
Result := -1
else
if Control1.Left > Control2.Left then
Result := 1
else
begin
Row1 := ToolBar.GetControlIndex(Control1);
Row2 := ToolBar.GetControlIndex(Control2);
// buttons order is reversed, iow last addeted button will be first
if Row1 < Row2 then
Result := 1
else
if Row1 > Row2 then
Result := -1
end;
end;
{------------------------------------------------------------------------------
@ -537,9 +551,10 @@ begin
AlignedControls.Add(CurControl)
end;
// sort OrderedControls
if FRealizedButtonHeight=0 then FRealizedButtonHeight:=FButtonHeight;
if FRealizedButtonHeight = 0 then
FRealizedButtonHeight := FButtonHeight;
OrderedControls.Sort(TListSortCompare(@CompareToolBarControl));
// position OrderedControls
CurClientRect:=ClientRect;
ARect:=CurClientRect;

10
lcl/include/toolbutton.inc
View File

@ -809,7 +809,8 @@ begin
if FToolBar<>nil then
FToolBar.RemoveButton(Self);
FToolBar:=nil;
if AParent is TToolBar then begin
if AParent is TToolBar then
begin
if Style in [tbsButton,tbsDropDown,tbsCheck] then
NewWidth:=TToolBar(AParent).ButtonWidth
else
@ -822,10 +823,11 @@ begin
inherited SetParent(AParent);
// add to new button list
if Parent is TToolBar then begin
if Parent is TToolBar then
begin
FToolBar:=TToolBar(Parent);
i:=Index;
if i<0 then
i := Index;
if i < 0 then
FToolBar.AddButton(Self);
UpdateVisibleToolbar;
end;