diff --git a/apps/documenteditor/main/app/view/FileMenuPanels.js b/apps/documenteditor/main/app/view/FileMenuPanels.js
index 13f2da499..f09186f6c 100644
--- a/apps/documenteditor/main/app/view/FileMenuPanels.js
+++ b/apps/documenteditor/main/app/view/FileMenuPanels.js
@@ -806,7 +806,7 @@ define([
updateScroller: function() {
if (this.scroller) {
Common.UI.Menu.Manager.hideAll();
- var scrolled = this.$el.height()< this.pnlTable.parent().height() + 25 + this.pnlApply.height();
+ var scrolled = this.$el.height()< this.pnlTable.parent().height() + 25 + this.pnlApply.height() + this.$el.find('.header').outerHeight(true);
this.pnlApply.toggleClass('hidden', !scrolled);
this.trApply.toggleClass('hidden', scrolled);
this.pnlSettings.css('overflow', scrolled ? 'hidden' : 'visible');
@@ -2498,6 +2498,7 @@ define([
'
',
'
',
'
',
+ '
<%= scope.txtPrint %>
',
'
',
'',
' |
',
@@ -2743,7 +2744,7 @@ define([
updateScroller: function() {
if (this.scroller) {
Common.UI.Menu.Manager.hideAll();
- var scrolled = this.$el.height()< this.pnlTable.height();
+ var scrolled = this.$el.height()< this.pnlTable.height() + 25 + this.$el.find('.main-header').outerHeight(true);
this.pnlSettings.css('overflow', scrolled ? 'hidden' : 'visible');
this.scroller.update();
}
diff --git a/apps/documenteditor/main/resources/less/filemenu.less b/apps/documenteditor/main/resources/less/filemenu.less
index 0fc34a746..8bc11ec5d 100644
--- a/apps/documenteditor/main/resources/less/filemenu.less
+++ b/apps/documenteditor/main/resources/less/filemenu.less
@@ -606,7 +606,10 @@
#file-menu-panel {
#panel-print {
padding: 0;
-
+ .main-header {
+ font-size: 16px;
+ margin: 18px 0 20px 0;
+ }
#id-print-settings {
position: absolute;
width:280px;
diff --git a/apps/presentationeditor/main/app/view/FileMenuPanels.js b/apps/presentationeditor/main/app/view/FileMenuPanels.js
index 48b217ff5..98a257219 100644
--- a/apps/presentationeditor/main/app/view/FileMenuPanels.js
+++ b/apps/presentationeditor/main/app/view/FileMenuPanels.js
@@ -643,7 +643,7 @@ define([
updateScroller: function() {
if (this.scroller) {
Common.UI.Menu.Manager.hideAll();
- var scrolled = this.$el.height()< this.pnlTable.height() + 25 + this.pnlApply.height();
+ var scrolled = this.$el.height()< this.pnlTable.height() + 25 + this.pnlApply.height() + this.$el.find('.header').outerHeight(true);
this.pnlApply.toggleClass('hidden', !scrolled);
this.trApply.toggleClass('hidden', scrolled);
this.pnlSettings.css('overflow', scrolled ? 'hidden' : 'visible');
@@ -1968,6 +1968,7 @@ define([
'',
'
',
'
',
+ '
<%= scope.txtPrint %>
',
'
',
'',
' |
',
@@ -2167,7 +2168,7 @@ define([
updateScroller: function() {
if (this.scroller) {
Common.UI.Menu.Manager.hideAll();
- var scrolled = this.$el.height()< this.pnlTable.height();
+ var scrolled = this.$el.height()< this.pnlTable.height() + 25 + this.$el.find('.main-header').outerHeight(true);
this.pnlSettings.css('overflow', scrolled ? 'hidden' : 'visible');
this.scroller.update();
}
diff --git a/apps/presentationeditor/main/resources/less/leftmenu.less b/apps/presentationeditor/main/resources/less/leftmenu.less
index abbcea2f1..511917383 100644
--- a/apps/presentationeditor/main/resources/less/leftmenu.less
+++ b/apps/presentationeditor/main/resources/less/leftmenu.less
@@ -586,6 +586,10 @@
#panel-print {
padding: 0;
+ .main-header {
+ font-size: 16px;
+ margin: 18px 0 20px 0;
+ }
#print-preview-empty {
padding: 14px;
color: @text-tertiary-ie;
diff --git a/apps/spreadsheeteditor/main/app/view/FileMenuPanels.js b/apps/spreadsheeteditor/main/app/view/FileMenuPanels.js
index 414175279..f47c75ae5 100644
--- a/apps/spreadsheeteditor/main/app/view/FileMenuPanels.js
+++ b/apps/spreadsheeteditor/main/app/view/FileMenuPanels.js
@@ -831,7 +831,7 @@ define([
updateScroller: function() {
if (this.scroller) {
Common.UI.Menu.Manager.hideAll();
- var scrolled = this.$el.height()< this.pnlTable.height() + 25 + this.pnlApply.height();
+ var scrolled = this.$el.height()< this.pnlTable.height() + 25 + this.pnlApply.height() + this.$el.find('.header').outerHeight(true);
this.pnlApply.toggleClass('hidden', !scrolled);
this.trApply.toggleClass('hidden', scrolled);
this.pnlSettings.css('overflow', scrolled ? 'hidden' : 'visible');
@@ -2764,13 +2764,6 @@ SSE.Views.FileMenuPanels.RecentFiles = Common.UI.BaseView.extend({
}));
}
- this.btnsSavePDF = [];
- for (var i=0; i<2; i++) {
- this.btnsSavePDF.push(new Common.UI.Button({
- el: $markup.findById('#print-btn-save-pdf-'+i)
- }));
- }
-
this.btnPrevPage = new Common.UI.Button({
parentEl: $markup.findById('#print-prev-page'),
cls: 'btn-prev-page',
@@ -2856,7 +2849,7 @@ SSE.Views.FileMenuPanels.RecentFiles = Common.UI.BaseView.extend({
updateScroller: function() {
if (this.scroller) {
Common.UI.Menu.Manager.hideAll();
- var scrolled = this.$el.height()< this.pnlTable.height() + 25 + this.pnlApply.height();
+ var scrolled = this.$el.height()< this.pnlTable.height() + 25 + this.pnlApply.height() + this.$el.find('.main-header').outerHeight(true);
this.pnlApply.toggleClass('hidden', !scrolled);
this.trApply.toggleClass('hidden', scrolled);
this.pnlSettings.css('overflow', scrolled ? 'hidden' : 'visible');