diff --git a/apps/common/main/lib/component/Window.js b/apps/common/main/lib/component/Window.js
index 2778c1cf0..5b2d2f430 100644
--- a/apps/common/main/lib/component/Window.js
+++ b/apps/common/main/lib/component/Window.js
@@ -241,7 +241,7 @@ define([
function _autoSize() {
if (this.initConfig.height == 'auto') {
- var height = parseInt(this.$window.find('> .body').css('height'));
+ var height = Math.ceil(parseFloat(this.$window.find('> .body').css('height')));
this.initConfig.header && (height += parseInt(this.$window.find('> .header').css('height')));
this.$window.height(height);
}
diff --git a/apps/common/main/lib/view/InsertTableDialog.js b/apps/common/main/lib/view/InsertTableDialog.js
index e9890a80f..39521c44f 100644
--- a/apps/common/main/lib/view/InsertTableDialog.js
+++ b/apps/common/main/lib/view/InsertTableDialog.js
@@ -48,7 +48,7 @@ define([
Common.Views.InsertTableDialog = Common.UI.Window.extend(_.extend({
options: {
width: 230,
- height: 156,
+ height: 157,
style: 'min-width: 230px;',
cls: 'modal-dlg',
split: false,
diff --git a/apps/common/main/lib/view/ListSettingsDialog.js b/apps/common/main/lib/view/ListSettingsDialog.js
index 4df5c4906..9fe04b56a 100644
--- a/apps/common/main/lib/view/ListSettingsDialog.js
+++ b/apps/common/main/lib/view/ListSettingsDialog.js
@@ -61,7 +61,7 @@ define([
options: {
type: 0, // 0 - markers, 1 - numbers
width: 280,
- height: 255,
+ height: 261,
style: 'min-width: 240px;',
cls: 'modal-dlg',
split: false,
diff --git a/apps/common/main/lib/view/SymbolTableDialog.js b/apps/common/main/lib/view/SymbolTableDialog.js
index 6032db74b..008a89954 100644
--- a/apps/common/main/lib/view/SymbolTableDialog.js
+++ b/apps/common/main/lib/view/SymbolTableDialog.js
@@ -430,7 +430,7 @@ define([
'
',
'',
'',
- ' |
',
'',
'',
- '',
+ '',
' | ',
'
',
'
',
@@ -1104,7 +1104,7 @@ define([
},
getMaxHeight: function(){
- return this.symbolTablePanel.innerHeight();
+ return this.symbolTablePanel.innerHeight()-2;
},
getRowsCount: function() {
@@ -1436,8 +1436,8 @@ define([
this.curSize = {resize: false, width: size[0], height: size[1]};
} else if (this.curSize.resize) {
this._preventUpdateScroll = false;
- this.curSize.height = size[1] - 302 + 38*(this.special ? 0 : 1);
- var rows = Math.max(1, ((this.curSize.height/CELL_HEIGHT) >> 0)),
+ this.curSize.height = size[1] - 304 + 38*(this.special ? 0 : 1);
+ var rows = Math.max(1, (((this.curSize.height-2)/CELL_HEIGHT) >> 0)),
height = rows*CELL_HEIGHT;
this.symbolTablePanel.css({'height': this.curSize.height + 'px'});
@@ -1447,7 +1447,7 @@ define([
this.updateView(undefined, undefined, undefined, true);
- this.specialList.cmpEl.height(size[1] - 156 + 38*(this.special ? 0 : 1));
+ this.specialList.cmpEl.height(size[1] - 157 + 38*(this.special ? 0 : 1));
!this.special && (size[1] += 38);
var valJson = JSON.stringify(size);
@@ -1465,16 +1465,16 @@ define([
this.curSize.resize = true;
this.curSize.width = size[0];
- this.curSize.height = size[1] - 302 + 38*(this.special ? 0 : 1);
+ this.curSize.height = size[1] - 304 + 38*(this.special ? 0 : 1);
- var rows = Math.max(1, ((this.curSize.height/CELL_HEIGHT) >> 0)),
+ var rows = Math.max(1, (((this.curSize.height-2)/CELL_HEIGHT) >> 0)),
height = rows*CELL_HEIGHT;
this.symbolTablePanel.css({'height': this.curSize.height + 'px'});
this.previewPanel.css({'height': height + 'px'});
this.previewScrolled.css({'height': height + 'px'});
- this.specialList.cmpEl.height(size[1] - 156 + 38*(this.special ? 0 : 1));
+ this.specialList.cmpEl.height(size[1] - 157 + 38*(this.special ? 0 : 1));
this.updateView(undefined, undefined, undefined, true);
}
diff --git a/apps/documenteditor/main/app/view/CrossReferenceDialog.js b/apps/documenteditor/main/app/view/CrossReferenceDialog.js
index d235eb341..fa8174f5c 100644
--- a/apps/documenteditor/main/app/view/CrossReferenceDialog.js
+++ b/apps/documenteditor/main/app/view/CrossReferenceDialog.js
@@ -46,7 +46,7 @@ define([
DE.Views.CrossReferenceDialog = Common.UI.Window.extend(_.extend({
options: {
width: 400,
- height: 407,
+ height: 410,
style: 'min-width: 240px;',
cls: 'modal-dlg',
modal: false
diff --git a/apps/documenteditor/main/app/view/LineNumbersDialog.js b/apps/documenteditor/main/app/view/LineNumbersDialog.js
index 55c23237a..4183e5dff 100644
--- a/apps/documenteditor/main/app/view/LineNumbersDialog.js
+++ b/apps/documenteditor/main/app/view/LineNumbersDialog.js
@@ -47,7 +47,7 @@ define([
DE.Views.LineNumbersDialog = Common.UI.Window.extend(_.extend({
options: {
width: 290,
- height: 320,
+ height: 332,
header: true,
style: 'min-width: 290px;',
cls: 'modal-dlg',
diff --git a/apps/documenteditor/main/app/view/ListSettingsDialog.js b/apps/documenteditor/main/app/view/ListSettingsDialog.js
index 75238cfd3..3af39c98f 100644
--- a/apps/documenteditor/main/app/view/ListSettingsDialog.js
+++ b/apps/documenteditor/main/app/view/ListSettingsDialog.js
@@ -55,7 +55,7 @@ define([
options: {
type: 0, // 0 - markers, 1 - numbers, 2 - multilevel
width: 300,
- height: 422,
+ height: 424,
style: 'min-width: 240px;',
cls: 'modal-dlg',
split: false,
@@ -67,7 +67,7 @@ define([
_.extend(this.options, {
title: this.txtTitle,
- height: (this.type==2) ? 376 : 422,
+ height: (this.type==2) ? 376 : 424,
width: (this.type==2) ? 430 : 300
}, options || {});
diff --git a/apps/documenteditor/main/app/view/NotesRemoveDialog.js b/apps/documenteditor/main/app/view/NotesRemoveDialog.js
index 2a755aaf5..6835592da 100644
--- a/apps/documenteditor/main/app/view/NotesRemoveDialog.js
+++ b/apps/documenteditor/main/app/view/NotesRemoveDialog.js
@@ -45,7 +45,7 @@ define([
DE.Views.NotesRemoveDialog = Common.UI.Window.extend(_.extend({
options: {
width: 214,
- height: 138,
+ height: 139,
header: true,
style: 'min-width: 214px;',
cls: 'modal-dlg',