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 67079

Browse Source
This commit is contained in:
maxkadushkin
2024-04-03 13:25:45 +03:00
parent 67e8491752
commit 6cda0d2c60
1 changed files with 8 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
macos/ONLYOFFICE/Code/Controllers/MainWindow/ASCTitleBarController.mm
View File

@ -53,10 +53,12 @@
#import "ASCThemesController.h"
#import "ASCApplicationManager.h"
#import "ASCLinguist.h"
#import "NSWindow+Extensions.h"
static float kASCWindowDefaultTrafficButtonsLeftMargin = 0;
static float kASCWindowMinTitleWidth = 0;
static float kASCRTLTabsRightMargin = 0;
@interface ASCTitleBarController () <ASCTabsControlDelegate, ASCDownloadControllerDelegate>
@property (nonatomic) NSArray *standardButtonsDefaults;
@ -209,6 +211,8 @@ static float kASCWindowMinTitleWidth = 0;
if ( [self.view userInterfaceLayoutDirection] == NSUserInterfaceLayoutDirectionRightToLeft ) {
self.buttonPortalLeadingConstraint.constant = -1;
self.buttonPortalTrailingConstraint.constant = 0;
kASCRTLTabsRightMargin = CGRectGetMinX([[self.tabsControl superview] frame]);
}
[self.tabsControl removeAllConstraints];
@ -265,11 +269,12 @@ static float kASCWindowMinTitleWidth = 0;
}
- (void)doLayout {
NSWindow * mainWindow = [NSWindow titleWindowOrMain];
int btnSpacing = 6.0;
CGFloat btnContainerWidth = CGRectGetWidth([self.standardButtonsDefaults[0] frame]) + btnSpacing;
CGFloat leftOffset = kASCWindowDefaultTrafficButtonsLeftMargin;
if ( [ASCLinguist isUILayoutDirectionRtl] ) {
CGFloat windowWidth = CGRectGetWidth([[self view] frame]);
CGFloat windowWidth = CGRectGetWidth([mainWindow frame]);
leftOffset = windowWidth - kASCWindowDefaultTrafficButtonsLeftMargin - btnContainerWidth * 3 + btnSpacing;
}
@ -296,7 +301,8 @@ static float kASCWindowMinTitleWidth = 0;
int rtlDependedLeftOffset = 0;
if ([self.view userInterfaceLayoutDirection] == NSUserInterfaceLayoutDirectionRightToLeft) {
NSRect rect = [[self.tabsControl superview] frame];
rtlDependedLeftOffset = rect.size.width - MIN(actualTabsWidth, maxTabsWidth);
CGFloat windowWidth = CGRectGetWidth([mainWindow frame]);
rtlDependedLeftOffset = windowWidth - kASCRTLTabsRightMargin - CGRectGetMinX(rect) - MIN(actualTabsWidth, maxTabsWidth);
}
self.tabsControl.frame = CGRectMake(rtlDependedLeftOffset, 0, MIN(actualTabsWidth, maxTabsWidth), CGRectGetHeight(self.tabsControl.frame));