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

Merge pull request #2065 from ONLYOFFICE/fix/print-preview

Browse source 
[DE][PE] Send paper size preset
This commit is contained in:
Julia Radzhabova 2022-11-17 22:52:56 +03:00 committed by GitHub
parent 6f59e5771b 8eb8226da2
commit 81fcfb05f0
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 29 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

25
apps/documenteditor/main/app/controller/Print.js
View file

@ -151,6 +151,25 @@ define([
return this;
},
findPagePreset: function(w, h) {
var width = (w<h) ? w : h,
height = (w<h) ? h : w;
var panel = this.printSettings;
var store = panel.cmbPaperSize.store,
item = null;
for (var i=0; i<store.length-1; i++) {
var rec = store.at(i),
size = rec.get('size'),
pagewidth = size[0],
pageheight = size[1];
if (Math.abs(pagewidth - width) < 0.1 && Math.abs(pageheight - height) < 0.1) {
item = rec;
break;
}
}
return item ? item.get('caption') : undefined;
},
onApiPageSize: function(w, h) {
this._state.pgsize = [w, h];
if (this.printSettings.isVisible()) {
@ -494,7 +513,11 @@ define([
var size = this.api.asc_getPageSize(this._state.firstPrintPage);
this.adjPrintParams.asc_setNativeOptions({
pages: this.printSettings.cmbRange.getValue()===-1 ? this.printSettings.inputPages.getValue() : this.printSettings.cmbRange.getValue(),
paperSize: size ? [size['W'], size['H']] : size,
paperSize: {
w: size ? size['W'] : undefined,
h: size ? size['H'] : undefined,
preset: size ? this.findPagePreset(size['W'], size['H']) : undefined
},
paperOrientation: size ? (size['H'] > size['W'] ? 'portrait' : 'landscape') : null
});

6
apps/presentationeditor/main/app/controller/Print.js
View file

@ -296,7 +296,11 @@ define([
var rec = this.printSettings.cmbPaperSize.getSelectedRecord();
this.adjPrintParams.asc_setNativeOptions({
pages: this.printSettings.cmbRange.getValue()===-1 ? this.printSettings.inputPages.getValue() : this.printSettings.cmbRange.getValue(),
paperSize: rec ? rec.size : null
paperSize: {
w: rec ? rec.size[0] : undefined,
h: rec ? rec.size[1] : undefined,
preset: rec ? rec.caption : undefined
}
});
this._isPrint = print;