pengjunjie/desktop-apps
1
0
Fork 1
mirror of https://github.com/ONLYOFFICE/desktop-apps.git synced 2026-04-07 14:09:22 +08:00
Code Issues Packages Projects Releases Wiki Activity

[macos] fix selected index after tab removed

Browse Source
This commit is contained in:
maxkadushkin
2024-02-29 17:33:23 +03:00
parent 6fc2b83ae4
commit 18ce44e7b3
1 changed files with 20 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
macos/ONLYOFFICE/Code/Controls/ASCTabs/ASCTabsControl.m
View File

@ -708,15 +708,27 @@ static NSString * const kASCTabsMulticastDelegateKey = @"asctabsmulticastDelegat
if (selected) {
NSInteger tabsCount = [self.tabs count];
if (tabsCount > tabIndex) {
[self selectTab:[self.tabs objectAtIndex:tabIndex]];
} else if (tabsCount > tabIndex - 1 && tabIndex - 1 >= 0) {
[self selectTab:[self.tabs objectAtIndex:tabIndex - 1]];
} else if (tabsCount > 0) {
[self selectTab:[self.tabs objectAtIndex:tabsCount - 1]];
} else {
[self selectTab:nil];
ASCTabView * tabToSelect = nil;
if ( tabsCount ) {
if ( [self userInterfaceLayoutDirection] != NSUserInterfaceLayoutDirectionRightToLeft ) {
if (tabsCount > tabIndex) {
tabToSelect = [self.tabs objectAtIndex:tabIndex];
// } else if (tabsCount > tabIndex - 1 && tabIndex - 1 >= 0) {
// tabToSelect = [self.tabs objectAtIndex:tabIndex - 1];
// } else if (tabsCount > 0) {
} else {
tabToSelect = [self.tabs objectAtIndex:tabsCount - 1];
}
} else {
if ( tabIndex > 0 ) {
tabToSelect = [self.tabs objectAtIndex:tabIndex - 1];
} else {
tabToSelect = [self.tabs objectAtIndex:tabIndex];
}
}
}
[self selectTab:tabToSelect];
}
}];
}