pengjunjie/desktop-apps
1
0
Fork 1
mirror of https://github.com/ONLYOFFICE/desktop-apps.git synced 2026-02-10 18:05:16 +08:00
Code Issues Packages Projects Releases Wiki Activity

[macos] fix bug 78050

Browse Source
This commit is contained in:
maxkadushkin
2025-11-12 13:53:11 +03:00
parent 45a1a3924e
commit 42b57d91c9
3 changed files with 11 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
macos/ONLYOFFICE/Code/Controllers/Common/ASCCommonViewController.mm
View File

@ -1872,6 +1872,9 @@
@"type": [ASCThemesController isCurrentThemeDark] ? @"dark" : @"light", @"type": [ASCThemesController isCurrentThemeDark] ? @"dark" : @"light",
@"system": mode}]; @"system": mode}];
[[ASCEditorJSVariables instance] apply]; [[ASCEditorJSVariables instance] apply];
json = [[NSMutableDictionary alloc] initWithDictionary: @{@"theme": [ASCThemesController actualThemeId]}];
appManager->UpdatePlugins([[json jsonString] stdwstring]);
} }
} }

1
macos/ONLYOFFICE/Code/Controllers/Common/ASCThemesController.h
View File

@ -60,6 +60,7 @@ static NSString * const windowBackgroundColor = @"window-backg
+ (NSString*)currentThemeId; + (NSString*)currentThemeId;
+ (BOOL)isCurrentThemeDark; + (BOOL)isCurrentThemeDark;
+ (NSString*)defaultThemeId:(BOOL)isdark; + (NSString*)defaultThemeId:(BOOL)isdark;
+ (NSString*)actualThemeId;
+ (NSColor*)color:(NSString*)name forTheme:(NSString*)theme; + (NSColor*)color:(NSString*)name forTheme:(NSString*)theme;
+ (NSColor*)currentThemeColor:(NSString*)name; + (NSColor*)currentThemeColor:(NSString*)name;
+ (BOOL)isSystemDarkMode; + (BOOL)isSystemDarkMode;

7
macos/ONLYOFFICE/Code/Controllers/Common/ASCThemesController.m
View File

@ -121,6 +121,13 @@
return isdark ? uiThemeNight : uiThemeWhite; return isdark ? uiThemeNight : uiThemeWhite;
} }
+ (NSString*)actualThemeId {
NSString * theme = [self currentThemeId];
if ([uiThemeSystem isEqualToString:theme]) {
return [self defaultThemeId:[self isCurrentThemeDark]];
} else return theme;
}
+ (NSColor*)currentThemeColor:(NSString*)name { + (NSColor*)currentThemeColor:(NSString*)name {
return [self color:name forTheme:[self currentThemeId]]; return [self color:name forTheme:[self currentThemeId]];
} }