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

Cocoa/TabControl: RemovePage() improved

Browse Source
This commit is contained in:
rich2014 2023-10-10 23:49:55 +08:00
parent 70423dd372
commit 82d467b50c
1 changed files with 57 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

66
lcl/interfaces/cocoa/cocoatabcontrols.pas
View File

@ -105,7 +105,7 @@ type
message 'exttabInsertTabViewItem:atIndex:';
procedure exttabMoveTabViewItem_toIndex(lTabPage: NSTabViewItem; NewIndex: integer);
message 'exttabMoveTabViewItem:toIndex:';
procedure exttabRemoveTabViewItem(lTabPage: NSTabViewItem);
procedure exttabRemoveTabViewItem(removedTabPage: NSTabViewItem);
message 'exttabRemoveTabViewItem:';
function exttabIndexOfTabViewItem(lTabPage: NSTabViewItem): NSInteger;
message 'exttabIndexOfTabViewItem:';
@ -851,19 +851,67 @@ begin
UpdateTabAndArrowVisibility( self );
end;
procedure TCocoaTabControl.exttabRemoveTabViewItem( lTabPage: NSTabViewItem );
procedure TCocoaTabControl.exttabRemoveTabViewItem( removedTabPage: NSTabViewItem );
var
isRemovingCurrentPage: Boolean;
removedIndex: Integer;
nextTabPage: NSTabViewItem;
prevTabPage: NSTabViewItem;
begin
removedIndex := exttabIndexOfTabViewItem( lTabPage );
fulltabs.removeObject( lTabPage );
if InRange(removedIndex, visibleLeftIndex, visibleRightIndex) then begin
removeTabViewItem( lTabPage );
leftKeepAmount:= currentIndex - visibleLeftIndex;
end else begin
if removedIndex < currentIndex then
removedIndex := exttabIndexOfTabViewItem( removedTabPage );
isRemovingCurrentPage:= (removedIndex=currentIndex);
if fulltabs.count=1 then begin
// there is only one Page, so must be removing current Page,
// the selectedItem must be lost
fulltabs.removeObjectAtIndex( removedIndex );
removeTabViewItem( removedTabPage );
end else if isRemovingCurrentPage then begin
// removing current Page, and there is at least one other Page.
// to keep the Page position stable and reduce selection changed events:
// 1. if the current page is on the rightmost of the visible TabView,
// try add the Next Page to the visible TabView first
// 2. then look at the TabView again and if it still only has one page,
// that means there is no Next Page, then there must be a prev Page,
// insert it into the TabView
// 3. if there is the next Page, select it, thne removedPage will be auto
// removed in UpdateTabAndArrowVisibility(), otherwise remove the
// removedPage directly, and the prev Page will be auto selected.
// 4. finally remove the Page to be removed in fulltabs
if currentIndex < fulltabs.count-1 then
nextTabPage:= NSTabViewItem( fulltabs.objectAtIndex(currentIndex+1) )
else
nextTabPage:= nil;
if (currentIndex=visibleRightIndex) and Assigned(nextTabPage) then begin // 1
addTabViewItem( nextTabPage );
inc( visibleRightIndex );
end;
if numberOfTabViewItems=1 then begin // 2
prevTabPage:= NSTabViewItem( fulltabs.objectAtIndex(currentIndex-1) );
insertTabViewItem_atIndex( prevTabPage, 0 );
end;
if Assigned(nextTabPage) then begin // 3
selectTabViewItem( nextTabPage );
end else begin
removeTabViewItem( removedTabPage );
end;
fulltabs.removeObjectAtIndex( removedIndex ); // 4
if removedIndex <= currentIndex then begin
dec( currentIndex );
dec( leftKeepAmount );
end;
end else begin
// not removing current page
// only fulltabs need to be changed,
// visible TabView auto updated in UpdateTabAndArrowVisibility()
fulltabs.removeObjectAtIndex( removedIndex );
if removedIndex < currentIndex then begin
dec( currentIndex );
if (removedIndex=visibleLeftIndex) and (removedIndex=currentIndex) then
leftKeepAmount:= 0;
end;
end;
UpdateTabAndArrowVisibility( self );
end;