From 310864b1d3aaaab7830d2503dba517cc0e90b2dc Mon Sep 17 00:00:00 2001 From: maxkadushkin Date: Mon, 29 Jan 2024 13:50:04 +0300 Subject: [PATCH] [macos] changed setting up rtl option for the app --- .../Code/Controllers/Common/ASCLinguist.m | 14 ++++++++------ .../MainWindow/ASCTitleBarController.mm | 2 -- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/macos/ONLYOFFICE/Code/Controllers/Common/ASCLinguist.m b/macos/ONLYOFFICE/Code/Controllers/Common/ASCLinguist.m index 8f5f72cdf..bf2e7b96a 100644 --- a/macos/ONLYOFFICE/Code/Controllers/Common/ASCLinguist.m +++ b/macos/ONLYOFFICE/Code/Controllers/Common/ASCLinguist.m @@ -51,13 +51,15 @@ static BOOL uiLayoutDirectionRTL = NO; // bool l = [NSLocale characterDirectionForLanguage:[ASCLinguist appLanguageCode]] == NSLocaleLanguageDirectionRightToLeft; NSString * direction = [[NSUserDefaults standardUserDefaults] objectForKey:ASCUserUILayoutDirection]; - if ( direction != nil ) { + if ( direction != nil ) uiLayoutDirectionRTL = [direction isEqualToString:@"rtl"]; - - if ( uiLayoutDirectionRTL ) { - // [[NSUserDefaults standardUserDefaults] setObject:@"YES" forKey:@"AppleTextDirection"]; - // [[NSUserDefaults standardUserDefaults] setObject:@"YES" forKey:@"NSForceRightToLeftWritingDirection"]; - } + + if ( uiLayoutDirectionRTL ) { + [[NSUserDefaults standardUserDefaults] setObject:@"YES" forKey:@"AppleTextDirection"]; + [[NSUserDefaults standardUserDefaults] setObject:@"YES" forKey:@"NSForceRightToLeftWritingDirection"]; + } else { + [[NSUserDefaults standardUserDefaults] removeObjectForKey:@"AppleTextDirection"]; + [[NSUserDefaults standardUserDefaults] removeObjectForKey:@"NSForceRightToLeftWritingDirection"]; } } diff --git a/macos/ONLYOFFICE/Code/Controllers/MainWindow/ASCTitleBarController.mm b/macos/ONLYOFFICE/Code/Controllers/MainWindow/ASCTitleBarController.mm index 9c73b9ca3..cac54def0 100644 --- a/macos/ONLYOFFICE/Code/Controllers/MainWindow/ASCTitleBarController.mm +++ b/macos/ONLYOFFICE/Code/Controllers/MainWindow/ASCTitleBarController.mm @@ -229,8 +229,6 @@ static float kASCWindowMinTitleWidth = 0; } } - if ( [ASCLinguist isUILayoutDirectionRtl] ) - [self.view setUserInterfaceLayoutDirection:NSUserInterfaceLayoutDirectionRightToLeft]; [self doLayout]; }