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 bug 57821

Browse Source
This commit is contained in:
maxkadushkin
2024-04-06 01:32:17 +03:00
parent f8401766c6
commit 68b1fab621
1 changed files with 11 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
macos/ONLYOFFICE/Code/Controls/ASCTabs/ASCTabView.m
View File

@ -101,6 +101,13 @@ static NSUInteger const kASTabViewCloseButtonSize = 12;
return copy;
}
- (void)refreshPortalTabIconset {
NSString * normalIcon = [NSApplication isSystemDarkMode] ? @"icon_tab_portal_inactive" : @"icon_tab_portal_active",
* activeIcon = [ASCThemesController isCurrentThemeDark] ? @"icon_tab_portal_inactive" : @"icon_tab_portal_active";
_icons[ASCTabViewTypePortal] = @{@"normal": normalIcon, @"active": activeIcon};
}
- (void)initialize {
_uuid = [[NSUUID UUID] UUIDString];
@ -122,9 +129,7 @@ static NSUInteger const kASTabViewCloseButtonSize = 12;
]
];
if ([NSApplication isSystemDarkMode]) {
_icons[ASCTabViewTypePortal] = @{@"normal": @"icon_tab_portal_inactive", @"active": @"icon_tab_portal_active"};
}
[self refreshPortalTabIconset];
ASCTabViewCell * tabCell = [[ASCTabViewCell alloc] initTextCell:self.title];
[self setBordered:NO];
@ -210,6 +215,7 @@ static NSUInteger const kASTabViewCloseButtonSize = 12;
_type = type;
if (type > ASCTabViewTypeUnknown && type < [_icons count]) {
[self refreshPortalTabIconset];
NSString * iconName = (self.state)
? _icons[type][@"active"]
: _icons[type][@"normal"];
@ -222,11 +228,8 @@ static NSUInteger const kASTabViewCloseButtonSize = 12;
ASCTabViewCell * tabViewCell = (ASCTabViewCell *)self.cell;
if (type == ASCTabViewTypePortal) {
if (@available(macOS 10.13, *)) {
tabViewCell.activeColor = [NSColor colorNamed:@"tab-portal-activeColor"];
} else {
tabViewCell.activeColor = UIColorFromRGB(0xffffff);
}
tabViewCell.activeColor = [ASCThemesController currentThemeColor:btnPortalActiveBackgroundColor];
tabViewCell.activeColor = [ASCThemesController currentThemeColor:btnPortalActiveBackgroundColor];
tabViewCell.activeTextColor = [tabViewCell.activeColor isLight] ? NSColor.blackColor : NSColor.whiteColor;
} else if (type == ASCTabViewTypeDocument) {
tabViewCell.activeColor = [ASCThemesController currentThemeColor:tabWordActiveBackgroundColor];