From c0c6a032798ccd4272cc4ad0ec22f5b66ec601fa Mon Sep 17 00:00:00 2001
From: Julia Radzhabova <julia.radzhabova@onlyoffice.com>
Date: Mon, 4 Apr 2022 21:10:04 +0300
Subject: [PATCH] Fix ole editor resizing

---
 .../common/main/lib/view/ExternalOleEditor.js | 27 ++++++++++---------
 1 file changed, 15 insertions(+), 12 deletions(-)

diff --git a/apps/common/main/lib/view/ExternalOleEditor.js b/apps/common/main/lib/view/ExternalOleEditor.js
index 13643cf6d..89b98d965 100644
--- a/apps/common/main/lib/view/ExternalOleEditor.js
+++ b/apps/common/main/lib/view/ExternalOleEditor.js
@@ -51,7 +51,7 @@ define([
                 width: 910,
                 height: (_inner_height - 700)<0 ? _inner_height : 700,
                 minwidth: 355,
-                minheight: 280,
+                minheight: 275,
                 cls: 'advanced-settings-dlg',
                 header: true,
                 toolclose: 'hide',
@@ -59,8 +59,10 @@ define([
                 resizable: true
             }, options);
 
+            this._headerFooterHeight = 85;
+
             this.template = [
-                '<div id="id-ole-editor-container" class="box" style="height:' + (_options.height-85) + 'px; padding: 0 5px;">',
+                '<div id="id-ole-editor-container" class="box" style="height:' + (_options.height-this._headerFooterHeight) + 'px; padding: 0 5px;">',
                     '<div id="id-ole-editor-placeholder" style="width: 100%;height: 100%;"></div>',
                 '</div>',
                 '<div class="separator horizontal"></div>',
@@ -80,7 +82,6 @@ define([
 
         render: function() {
             Common.UI.Window.prototype.render.call(this);
-            this._headerFooterHeight = 85 + ((parseInt(this.$window.css('border-top-width')) + parseInt(this.$window.css('border-bottom-width'))));
             this.boxEl = this.$window.find('.body > .box');
 
             this.btnSave = new Common.UI.Button({
@@ -144,7 +145,7 @@ define([
                 var header_height = (this.initConfig.header) ? parseInt(this.$window.find('> .header').css('height')) : 0;
 
                 this.$window.find('> .body').css('height', height-header_height);
-                this.$window.find('> .body > .box').css('height', height-85);
+                this.$window.find('> .body > .box').css('height', height-this._headerFooterHeight);
             }
         },
 
@@ -161,20 +162,22 @@ define([
             var maxHeight = Common.Utils.innerHeight(),
                 maxWidth = Common.Utils.innerWidth(),
                 borders_width = (parseInt(this.$window.css('border-left-width')) + parseInt(this.$window.css('border-right-width'))),
-                bordersOffset = this.bordersOffset*2;
+                paddings = (parseInt(this.boxEl.css('padding-left')) + parseInt(this.boxEl.css('padding-right')));
             height += 90; // add toolbar and statusbar height
-            if (maxHeight - bordersOffset<height + this._headerFooterHeight)
-                height = maxHeight - bordersOffset - this._headerFooterHeight;
-            if (maxWidth - bordersOffset<width + borders_width)
-                width = maxWidth - bordersOffset - borders_width;
+            if (maxHeight<height + this._headerFooterHeight)
+                height = maxHeight - this._headerFooterHeight;
+            if (maxWidth<width + paddings + borders_width)
+                width = maxWidth - paddings - borders_width;
 
             this.boxEl.css('height', height);
 
             this.setHeight(height + this._headerFooterHeight);
-            this.setWidth(width + borders_width);
+            this.setWidth(width + paddings + borders_width);
 
-            // this.$window.css('left',(maxWidth - width - borders_width) / 2);
-            // this.$window.css('top',(maxHeight - height - this._headerFooterHeight) / 2);
+            if (this.getLeft()<0)
+                this.$window.css('left', 0);
+            if (this.getTop() < Common.Utils.InternalSettings.get('window-inactive-area-top') )
+                this.$window.css('top', Common.Utils.InternalSettings.get('window-inactive-area-top'));
         },
 
         setPlaceholder: function(placeholder) {