Marmelator/red-ui
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1.4k Wiki Activity

more work on viewer sync

Browse Source
This commit is contained in:
Timo Bejan 2020-10-14 10:24:08 +03:00
parent c5891c9368
commit 60bef6b7ac
2 changed files with 22 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
apps/red-ui/src/app/screens/file/pdf-viewer/pdf-viewer.component.ts
View File

@ -59,9 +59,6 @@ export class PdfViewerComponent implements OnInit, AfterViewInit, OnDestroy {
wvDocumentLoadedHandler(): void { wvDocumentLoadedHandler(): void {
this.wvInstance.setFitMode('FitWidth'); this.wvInstance.setFitMode('FitWidth');
const displayMode = this.wvInstance.docViewer.getDisplayModeManager().getDisplayMode();
displayMode.mode = 'Continuous';
this.wvInstance.docViewer.getDisplayModeManager().setDisplayMode(displayMode);
this.fileReady.emit(); this.fileReady.emit();
} }
@ -138,7 +135,9 @@ export class PdfViewerComponent implements OnInit, AfterViewInit, OnDestroy {
'notesPanel', 'notesPanel',
'thumbnailControl', 'thumbnailControl',
'documentControl', 'documentControl',
'ribbons' 'ribbons',
'rotateClockwiseButton',
'rotateCounterClockwiseButton'
]); ]);
} }

27
apps/red-ui/src/app/screens/file/service/viewer-sync.service.ts
View File

@ -14,29 +14,40 @@ export class ViewerSyncService {
} }
syncViewers() { syncViewers() {
localStorage.clear();
if (this._activeViewer) { if (this._activeViewer) {
const lastScrolledViewer = this._viewers[this._activeViewer]; const lastActiveViewer = this._viewers[this._activeViewer];
if (lastScrolledViewer) { if (lastActiveViewer) {
const lastScrolledViewerScrollElement = lastScrolledViewer.docViewer.getScrollViewElement();
const lastDisplayMode = lastActiveViewer.docViewer.getDisplayModeManager().getDisplayMode().mode;
const lastLayoutMode = lastActiveViewer.getLayoutMode();
const lastPageNumber = lastActiveViewer.docViewer.getCurrentPage();
const lastScrolledViewerScrollElement = lastActiveViewer.docViewer.getScrollViewElement();
const lastViewerScrollTop = lastScrolledViewerScrollElement.scrollTop; const lastViewerScrollTop = lastScrolledViewerScrollElement.scrollTop;
const lastViewerScrollLeft = lastScrolledViewerScrollElement.scrollLeft; const lastViewerScrollLeft = lastScrolledViewerScrollElement.scrollLeft;
const lastViewerZoom = lastActiveViewer.docViewer.getZoom();
const currentZoom = lastScrolledViewer.docViewer.getZoom(); const lastViewerLeftPaneState = lastActiveViewer.isElementOpen('leftPanel');
const isLeftPanelOpen = lastScrolledViewer.isElementOpen('leftPanel');
for (const key of Object.keys(this._viewers)) { for (const key of Object.keys(this._viewers)) {
if (key !== this._activeViewer) { if (key !== this._activeViewer) {
const instance = this._viewers[key]; const instance = this._viewers[key];
// sync layout and display mode
instance.docViewer.setCurrentPage(lastPageNumber);
instance.setLayoutMode(lastLayoutMode);
const displayMode =instance.docViewer.getDisplayModeManager().getDisplayMode();
displayMode.mode = lastDisplayMode;
instance.docViewer.getDisplayModeManager().setDisplayMode(displayMode);
// Synchronize zoom - needs to be done before scrolling // Synchronize zoom - needs to be done before scrolling
instance.docViewer.zoomTo(currentZoom); instance.docViewer.zoomTo(lastViewerZoom);
// Synchronize scroll // Synchronize scroll
const viewerScrollElement = instance.docViewer.getScrollViewElement(); const viewerScrollElement = instance.docViewer.getScrollViewElement();
viewerScrollElement.scrollTo(lastViewerScrollLeft, lastViewerScrollTop); viewerScrollElement.scrollTo(lastViewerScrollLeft, lastViewerScrollTop);
// Synchronize left panel // Synchronize left panel
if (isLeftPanelOpen) { if (lastViewerLeftPaneState) {
instance.openElements(['leftPanel']); instance.openElements(['leftPanel']);
} else { } else {
instance.closeElements(['leftPanel']); instance.closeElements(['leftPanel']);