From c8ad4c83582a9d3d696dba88c9ff1ebf4ef711e7 Mon Sep 17 00:00:00 2001 From: "Julia.Radzhabova" Date: Thu, 29 May 2025 22:27:38 +0300 Subject: [PATCH] Fix toolbar size after changing theme --- .../main/app/controller/Viewport.js | 3 ++- .../pdfeditor/main/app/controller/Viewport.js | 7 ++++-- .../main/app/controller/Viewport.js | 4 +++- .../main/app/controller/Viewport.js | 23 +++++++++++-------- .../main/app/controller/Viewport.js | 4 +++- 5 files changed, 26 insertions(+), 15 deletions(-) diff --git a/apps/documenteditor/main/app/controller/Viewport.js b/apps/documenteditor/main/app/controller/Viewport.js index cb7b4c35f1..b6b03f4096 100644 --- a/apps/documenteditor/main/app/controller/Viewport.js +++ b/apps/documenteditor/main/app/controller/Viewport.js @@ -343,7 +343,8 @@ define([ const computed_style = window.getComputedStyle(document.body); _intvars.set('toolbar-height-controls', parseInt(computed_style.getPropertyValue("--toolbar-height-controls") || 84)); _intvars.set('toolbar-height-normal', _intvars.get('toolbar-height-tabs') + _intvars.get('toolbar-height-controls')); - $filemenu.css('top', (Common.UI.LayoutManager.isElementVisible('toolbar') ? _intvars.get('toolbar-height-tabs-top-title') : 0) + _intvars.get('document-title-height')); + $filemenu.css('top', (Common.UI.LayoutManager.isElementVisible('toolbar') ? _intvars.get('toolbar-height-tabs') : 0) + + (this.appConfig.twoLevelHeader && !this.appConfig.compactHeader ? _intvars.get('document-title-height') : 0)); this.viewport.vlayout.getItem('toolbar').height = this.toolbar && this.toolbar.isCompact() ? _intvars.get('toolbar-height-compact') : _intvars.get('toolbar-height-normal'); diff --git a/apps/pdfeditor/main/app/controller/Viewport.js b/apps/pdfeditor/main/app/controller/Viewport.js index a764796ea0..dbd5377732 100644 --- a/apps/pdfeditor/main/app/controller/Viewport.js +++ b/apps/pdfeditor/main/app/controller/Viewport.js @@ -78,7 +78,7 @@ define([ toolbar.setExtra('right', me.header.getPanel('right', config)); if (!config.twoLevelHeader || config.compactHeader) toolbar.setExtra('left', me.header.getPanel('left', config)); - + me.toolbar = toolbar; /*var value = Common.localStorage.getBool("pdfe-settings-quick-print-button", true); Common.Utils.InternalSettings.set("pdfe-settings-quick-print-button", value); if (me.header && me.header.btnPrintQuick) @@ -170,6 +170,8 @@ define([ onAppShowed: function (config) { var me = this; + me.appConfig = config; + var _intvars = Common.Utils.InternalSettings; var $filemenu = $('.toolbar-fullview-panel'); $filemenu.css('top', Common.UI.LayoutManager.isElementVisible('toolbar') ? _intvars.get('toolbar-height-tabs') : 0); @@ -371,7 +373,8 @@ define([ const computed_style = window.getComputedStyle(document.body); _intvars.set('toolbar-height-controls', parseInt(computed_style.getPropertyValue("--toolbar-height-controls") || 84)); _intvars.set('toolbar-height-normal', _intvars.get('toolbar-height-tabs') + _intvars.get('toolbar-height-controls')); - $filemenu.css('top', (Common.UI.LayoutManager.isElementVisible('toolbar') ? _intvars.get('toolbar-height-tabs-top-title') : 0) + _intvars.get('document-title-height')); + $filemenu.css('top', (Common.UI.LayoutManager.isElementVisible('toolbar') ? _intvars.get('toolbar-height-tabs') : 0) + + (this.appConfig.twoLevelHeader && !this.appConfig.compactHeader ? _intvars.get('document-title-height') : 0)); this.viewport.vlayout.getItem('toolbar').height = this.toolbar && this.toolbar.isCompact() ? _intvars.get('toolbar-height-compact') : _intvars.get('toolbar-height-normal'); diff --git a/apps/presentationeditor/main/app/controller/Viewport.js b/apps/presentationeditor/main/app/controller/Viewport.js index 9e875e7d2a..97f080f19d 100644 --- a/apps/presentationeditor/main/app/controller/Viewport.js +++ b/apps/presentationeditor/main/app/controller/Viewport.js @@ -79,6 +79,7 @@ define([ toolbar.setExtra('right', me.header.getPanel('right', config)); if (!config.twoLevelHeader || config.compactHeader) toolbar.setExtra('left', me.header.getPanel('left', config)); + me.toolbar = toolbar; /*var value = Common.localStorage.getBool("pe-settings-quick-print-button", true); Common.Utils.InternalSettings.set("pe-settings-quick-print-button", value); if (me.header && me.header.btnPrintQuick) @@ -396,7 +397,8 @@ define([ const computed_style = window.getComputedStyle(document.body); _intvars.set('toolbar-height-controls', parseInt(computed_style.getPropertyValue("--toolbar-height-controls") || 84)); _intvars.set('toolbar-height-normal', _intvars.get('toolbar-height-tabs') + _intvars.get('toolbar-height-controls')); - $filemenu.css('top', (Common.UI.LayoutManager.isElementVisible('toolbar') ? _intvars.get('toolbar-height-tabs-top-title') : 0) + _intvars.get('document-title-height')); + $filemenu.css('top', (Common.UI.LayoutManager.isElementVisible('toolbar') ? _intvars.get('toolbar-height-tabs') : 0) + + (this.appConfig.twoLevelHeader && !this.appConfig.compactHeader ? _intvars.get('document-title-height') : 0)); this.viewport.vlayout.getItem('toolbar').height = this.toolbar && this.toolbar.isCompact() ? _intvars.get('toolbar-height-compact') : _intvars.get('toolbar-height-normal'); diff --git a/apps/spreadsheeteditor/main/app/controller/Viewport.js b/apps/spreadsheeteditor/main/app/controller/Viewport.js index 33921b3bdb..c3e79a3d7e 100644 --- a/apps/spreadsheeteditor/main/app/controller/Viewport.js +++ b/apps/spreadsheeteditor/main/app/controller/Viewport.js @@ -88,7 +88,7 @@ define([ if ( me.appConfig && me.appConfig.isEdit && !config.compactHeader && toolbar.btnCollabChanges ) toolbar.btnCollabChanges = me.header.btnSave; - + me.toolbar = toolbar; /*var value = Common.localStorage.getBool("sse-settings-quick-print-button", true); Common.Utils.InternalSettings.set("sse-settings-quick-print-button", value); if (me.header && me.header.btnPrintQuick) @@ -147,8 +147,7 @@ define([ config.customization && config.customization.compactToolbar )) { me.viewport.vlayout.getItem('toolbar').height = _intvars.get('toolbar-height-compact'); - } else - if ( config.isEditDiagram || config.isEditMailMerge || config.isEditOle ) { + } else if ( config.isEditDiagram || config.isEditMailMerge || config.isEditOle ) { me.viewport.vlayout.getItem('toolbar').height = 41; document.body.classList.add('inner-simple-editor'); } @@ -360,16 +359,20 @@ define([ onThemeChanged: function () { if (Common.UI.Themes.available()) { - var _intvars = Common.Utils.InternalSettings; - var $filemenu = $('.toolbar-fullview-panel'); + var _intvars = Common.Utils.InternalSettings, + config = this.appConfig; const computed_style = window.getComputedStyle(document.body); - _intvars.set('toolbar-height-controls', parseInt(computed_style.getPropertyValue("--toolbar-height-controls") || 84)); - _intvars.set('toolbar-height-normal', _intvars.get('toolbar-height-tabs') + _intvars.get('toolbar-height-controls')); - $filemenu.css('top', (Common.UI.LayoutManager.isElementVisible('toolbar') ? _intvars.get('toolbar-height-tabs-top-title') : 0) + _intvars.get('document-title-height')); - this.viewport.vlayout.getItem('toolbar').height = this.toolbar && this.toolbar.isCompact() ? - _intvars.get('toolbar-height-compact') : _intvars.get('toolbar-height-normal'); + if ( config.twoLevelHeader && !config.isEditDiagram && !config.isEditMailMerge && !config.isEditOle && !config.compactHeader) { + var $filemenu = $('.toolbar-fullview-panel'); + _intvars.set('toolbar-height-controls', parseInt(computed_style.getPropertyValue("--toolbar-height-controls") || 84)); + _intvars.set('toolbar-height-normal', _intvars.get('toolbar-height-tabs') + _intvars.get('toolbar-height-controls')); + $filemenu.css('top', (Common.UI.LayoutManager.isElementVisible('toolbar') ? _intvars.get('toolbar-height-tabs') : 0) + _intvars.get('document-title-height')); + + this.viewport.vlayout.getItem('toolbar').height = this.toolbar && this.toolbar.isCompact() ? + _intvars.get('toolbar-height-compact') : _intvars.get('toolbar-height-normal'); + } var height = parseInt(computed_style.getPropertyValue('--statusbar-height')); var NoCompact = $('.statusbar').hasClass('no-compact'); diff --git a/apps/visioeditor/main/app/controller/Viewport.js b/apps/visioeditor/main/app/controller/Viewport.js index a639cbb3ad..5c150d7b98 100644 --- a/apps/visioeditor/main/app/controller/Viewport.js +++ b/apps/visioeditor/main/app/controller/Viewport.js @@ -84,6 +84,7 @@ define([ toolbar.setExtra('right', me.header.getPanel('right', config)); if (!config.twoLevelHeader || config.compactHeader) toolbar.setExtra('left', me.header.getPanel('left', config)); + me.toolbar = toolbar; me.header.btnSearch.hide(); /*var value = Common.localStorage.getBool("ve-settings-quick-print-button", true); Common.Utils.InternalSettings.set("ve-settings-quick-print-button", value); @@ -337,7 +338,8 @@ define([ const computed_style = window.getComputedStyle(document.body); _intvars.set('toolbar-height-controls', parseInt(computed_style.getPropertyValue("--toolbar-height-controls") || 84)); _intvars.set('toolbar-height-normal', _intvars.get('toolbar-height-tabs') + _intvars.get('toolbar-height-controls')); - $filemenu.css('top', (Common.UI.LayoutManager.isElementVisible('toolbar') ? _intvars.get('toolbar-height-tabs-top-title') : 0) + _intvars.get('document-title-height')); + $filemenu.css('top', (Common.UI.LayoutManager.isElementVisible('toolbar') ? _intvars.get('toolbar-height-tabs') : 0) + + (this.appConfig.twoLevelHeader && !this.appConfig.compactHeader ? _intvars.get('document-title-height') : 0)); this.viewport.vlayout.getItem('toolbar').height = this.toolbar && this.toolbar.isCompact() ? _intvars.get('toolbar-height-compact') : _intvars.get('toolbar-height-normal');