Lea/web-apps
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Merge pull request #2132 from ONLYOFFICE/fix/bug-22445

Browse source 
Bug 22445
This commit is contained in:
maxkadushkin 2022-12-15 10:49:56 +03:00 committed by GitHub
parent 645f8cd55b fd6cd5a288
commit a252e632d9
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 22 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

25
apps/common/main/lib/component/Window.js
View file

@ -265,8 +265,10 @@ define([
var top = main_geometry.top + Math.floor((parseInt(main_height) - parseInt(win_height)) / 2); var top = main_geometry.top + Math.floor((parseInt(main_height) - parseInt(win_height)) / 2);
var left = Math.floor((parseInt(main_width) - parseInt(win_width)) / 2); var left = Math.floor((parseInt(main_width) - parseInt(win_width)) / 2);
this.$window.css('left',left); this.$window.css({
this.$window.css('top',top); left: left < 0 ? 0 : left,
top: top < 0 ? 0 : top
});
} }
function _setVisible() { function _setVisible() {
@ -355,6 +357,23 @@ define([
} }
} }
function _onResizeMove(){
var main_geometry = _readDocumetGeometry(),
main_width = main_geometry.width,
main_height = main_geometry.height,
win_height = this.getHeight(),
win_width = this.getWidth(),
top = this.getTop(),
left = this.getLeft();
top = top + win_height > main_height ? main_height - win_height : top;
left = left + win_width > main_width ? main_width - win_width : left;
this.$window.css({
left: left < 0 ? 0 : left,
top: top < 0 ? 0 : top
});
}
/* window resize functions */ /* window resize functions */
function _resizestart(event) { function _resizestart(event) {
@ -658,7 +677,7 @@ define([
this.$window.find('.header').on('mousedown', this.binding.dragStart); this.$window.find('.header').on('mousedown', this.binding.dragStart);
this.$window.find('.tool.close').on('click', _.bind(doclose, this)); this.$window.find('.tool.close').on('click', _.bind(doclose, this));
this.$window.find('.tool.help').on('click', _.bind(dohelp, this)); this.$window.find('.tool.help').on('click', _.bind(dohelp, this));
$(window).on('resize', _.bind(_onResizeMove, this));
if (!this.initConfig.modal) if (!this.initConfig.modal)
Common.Gateway.on('processmouse', _.bind(_onProcessMouse, this)); Common.Gateway.on('processmouse', _.bind(_onProcessMouse, this));
} else { } else {