Merge branch release/v9.1.0 into develop

Author: SimplestStudio

common/loginpage/providers/seafile/config.json

@@ -4,7 +4,8 @@
     "check": {
         "url": "/api2/server-info/"
     },
-    "editorPage": "regex:\/lib\/(?:[\w-]{32,})\/file\/.*\.(docx|pptx|xlsx|doc|ppt|xls|odt|fodt|odp|fodp|fods)$",
+    "editorPage": "regex:\/lib\/(?:[\w-]{32,})\/file\/.*\.(docx|pptx|xlsx|doc|ppt|xls|odt|fodt|odp|fodp|fods)",
+    "editorFrameSize": "finite",
     "cryptoSupport": "true",
     "icons": {
         "themeLight":{

common/loginpage/src/panelexternal.js

@@ -133,7 +133,9 @@
             if ( panel_id.includes('\{B17BDC61\-') ) {
                 _encrype_workaround(_panel);
             } else
-            if ( panel_id.includes('F2402876-659F-47FB-A646-67B49F2B5AAA') ) {
+            if ( panel_id.includes('F2402876-659F-47FB-A646-67B49F2B5AAA') ||
+                    panel_id.includes('9DC93CDB-B576-4F0C-B55E-FCC9C48DD777') )
+            {
                 const $svgicon = _panel.$menuitem.find('svg.icon');
                 if ( $svgicon.length ) {
                     $svgicon.data('iconname', 'aichat');

common/loginpage/src/panelrecent.js

@@ -328,7 +328,7 @@
         };
 
         var _on_recovers = function(params) {
-            if ( true )
+            if ( false )
                 window.sdk.command("recovery:update", JSON.stringify(params));
             else {
                 collectionRecovers.empty();

macos/ONLYOFFICE/Code/Controllers/Common/ASCCommonViewController.h

@@ -42,7 +42,7 @@
 #import "ASCTabView.h"
 #import "NSCefView.h"
 
-@interface ASCCommonViewController : NSViewController
+@interface ASCCommonViewController : NSViewController <NSTabViewDelegate>
 - (BOOL)shouldTerminateApplication;
 - (BOOL)shouldCloseMainWindow;
 
@@ -53,4 +53,3 @@
 - (void)openEULA;
 - (void)openPreferences;
 @end
-

macos/ONLYOFFICE/Code/Controllers/Common/ASCCommonViewController.mm

@@ -51,6 +51,7 @@ static NSString * const tabSlideActiveBackgroundColor   = @"tab-slide-background
 static NSString * const tabPdfActiveBackgroundColor     = @"tab-pdf-background-active-color";
 static NSString * const tabDrawActiveBackgroundColor    = @"tab-draw-background-active-color";
 static NSString * const tabActiveTextColor              = @"tab-editor-text-active-color";
+static NSString * const windowBackgroundColor           = @"window-background-color";
 
 @interface ASCThemesController : NSObject
 

macos/ONLYOFFICE/Code/Controllers/Common/ASCThemesController.h

@@ -146,6 +146,15 @@ + (NSColor*)color:(NSString*)name forTheme:(NSString*)theme {
                 return [NSColor colorNamed:@"tab-portal-activeColor"];
             else return kColorRGBA(255, 255, 255, 1.0);
         }
+    } else if ( [name isEqualToString:windowBackgroundColor] ) {
+        if ( [theme isEqualToString:uiThemeDark] ) return UIColorFromRGB(0x282828);
+        else if ( [theme isEqualToString:uiThemeContrastDark] ) return UIColorFromRGB(0x181818);
+        else if ( [theme isEqualToString:uiThemeGray] ) return UIColorFromRGB(0xd9d9d9);
+        else if ( [theme isEqualToString:uiThemeNight] ) return UIColorFromRGB(0x383838);
+        else if ( [theme isEqualToString:uiThemeWhite] ) return UIColorFromRGB(0xeaeaea);
+        else {
+            return UIColorFromRGB(0xe4e4e4);
+        }
     } else {
         if ( [theme isEqualToString:uiThemeDark] ) return UIColorFromRGB(0x2a2a2a);
         else if ( [theme isEqualToString:uiThemeContrastDark] ) return UIColorFromRGB(0x1e1e1e);

macos/ONLYOFFICE/Code/Controllers/Common/ASCThemesController.m

@@ -138,7 +138,7 @@ - (void)destroy {
         return;
     }
 
-    [_controller close];
+    [_controller.window performClose:nil];
     _isDisplay = false;
 }
 

macos/ONLYOFFICE/Code/Controllers/PresentationReporter/ASCPresentationReporter.mm

@@ -59,5 +59,7 @@
 - (instancetype)duplicate;
 - (void)shake;
 - (NSImage *)imageRepresentation;
+- (NSImage *)windowScreenshot;
+- (nullable NSView *)subviewOfClassName:(NSString * _Nonnull)className;
 
 @end

macos/ONLYOFFICE/Code/Extensions/NSView+Extensions.h

@@ -265,4 +265,54 @@ - (NSImage *)imageRepresentation {
     return image;
 }
 
+- (nullable NSImage *)windowScreenshot {
+    if (self.window) {
+        NSRect viewFrameInWindow = [self convertRect:self.bounds toView:nil];
+        NSRect windowFrame = [self.window convertRectToScreen:viewFrameInWindow];
+        CGRect mainDisplayBounds = CGDisplayBounds(CGMainDisplayID());
+        
+        CGFloat cgX = windowFrame.origin.x;
+        CGFloat cgY = mainDisplayBounds.size.height - windowFrame.origin.y - windowFrame.size.height;
+        
+        CGImageRef cgImage = CGWindowListCreateImage
+        (
+         CGRectMake(cgX, cgY, windowFrame.size.width, windowFrame.size.height),
+         kCGWindowListOptionIncludingWindow,
+         (CGWindowID)[self.window windowNumber],
+         kCGWindowImageBoundsIgnoreFraming | kCGWindowImageShouldBeOpaque
+         );
+        
+        NSImage *snapshot = nil;
+        if (cgImage) {
+            snapshot = [[NSImage alloc] initWithCGImage:cgImage size:viewFrameInWindow.size];
+            CGImageRelease(cgImage);
+        }
+        
+        return snapshot;
+    }
+    
+    return nil;
+}
+
+- (nullable NSView *)subviewOfClassName:(NSString * _Nonnull)className {
+    Class cls = NSClassFromString(className);
+    
+    if (!cls) {
+        return nil;
+    }
+
+    for (NSView *subview in self.subviews) {
+        if ([subview isKindOfClass:cls]) {
+            return subview;
+        }
+        
+        NSView *found = [subview subviewOfClassName:className];
+        
+        if (found) {
+            return found;
+        }
+    }
+    return nil;
+}
+
 @end