Multipage view layout misc.

* Rename twopages.svg to lc_multipageview.svg so the file is automatically recognized by the JSDialog class.
* Use map state handlers for toggling the multipage view layout. JSDialog class can toggle its button automatically.
* Remove twopages_a.svg since JSDialogs has its own toggled state style.
* Rename getPos2 to getPosSimplePoint and add an explanation.
* Disable setting the viewSize and viewedRectangle properties externally in multipage view. Remove type checks from a few places.

Signed-off-by: Gökay Şatır <[email protected]>
Change-Id: I84634917f221a7908ad14d5ed0f619f61729900d

Author: gokaysatir

browser/images/twopages.svg renamed to browser/images/lc_multipageview.svg

@@ -55,7 +55,8 @@ class TileCoordData {
 		return new cool.Point(this.x, this.y);
 	}
 
-	getPos2() {
+	// Returns SimplePoint. To replace getPos in the short term.
+	getPosSimplePoint() {
 		return cool.SimplePoint.fromCorePixels([this.x, this.y], this.part);
 	}
 

browser/images/twopages_a.svg

@@ -411,4 +411,20 @@ class ViewLayoutMultiPage extends ViewLayoutBase {
 		this.resetViewLayout();
 		this.updateViewData();
 	}
+
+	public get viewSize() {
+		return this._viewSize;
+	}
+
+	public set viewSize(size: cool.SimplePoint) {
+		return; // Disable setting the size externally.
+	}
+
+	public get viewedRectangle() {
+		return this._viewedRectangle;
+	}
+
+	public set viewedRectangle(rectangle: cool.SimpleRectangle) {
+		return; // Disable setting the viewed rectangle externally.
+	}
 }

browser/src/app/TilesMiddleware.ts

@@ -2130,11 +2130,11 @@ export class CommentSection extends CanvasSectionObject {
 		if (availableSpace < this.sectionProperties.commentWidth && !this.isCollapsed)
 			horizontalScroll = (app.activeDocument.fileSize.cX + this.sectionProperties.commentWidth) * app.pixelsToTwips * app.dpiScale;
 
-		if (lastY > app.activeDocument.fileSize.pY && app.activeDocument.activeView.type !== 'ViewLayoutMultiPage') {
+		if (lastY > app.activeDocument.fileSize.pY) {
 			app.activeDocument.activeView.viewSize = new cool.SimplePoint(horizontalScroll, lastY * app.pixelsToTwips);
 			this.containerObject.requestReDraw();
 		}
-		else if (app.activeDocument.activeView.type !== 'ViewLayoutMultiPage')
+		else
 			app.activeDocument.activeView.viewSize = new cool.SimplePoint(horizontalScroll, app.activeDocument.fileSize.y);
 
 		this.disableLayoutAnimation = false;

browser/src/app/ViewLayoutMultiPage.ts

@@ -196,7 +196,7 @@ export class TilesSection extends CanvasSectionObject {
 
 	// eslint-disable-next-line @typescript-eslint/explicit-module-boundary-types
 	private paintSimple (tile: any, async: boolean): void {
-		const tilePos: cool.SimplePoint = tile.coords.getPos2();
+		const tilePos: cool.SimplePoint = tile.coords.getPosSimplePoint();
 
 		if ((async || this.containerObject.isZoomChanged()) && !app.file.fileBasedView) {
 			// Non Calc tiles(handled by paintSimple) can have transparent pixels,
@@ -376,7 +376,7 @@ export class TilesSection extends CanvasSectionObject {
 			const tile = TileManager.get(visibleCoordList[i]);
 
 			if (tile && tile.isReadyToDraw()) {
-				const tilePos = tile.coords.getPos2();
+				const tilePos = tile.coords.getPosSimplePoint();
 
 				const layoutRectangle1 = view.documentRectangles[view.getClosestRectangleIndex(tilePos)];
 				const layoutRectangle2 = view.documentRectangles[view.getClosestRectangleIndex(cool.SimplePoint.fromCorePixels([tilePos.pX, tilePos.pY + TileManager.tileSize]))];

browser/src/canvas/sections/CommentListSection.ts

@@ -247,7 +247,7 @@ class StatusBar extends JSDialog.Toolbar {
 			{type: 'toolitem', id: 'signstatus', command: '.uno:Signature', w2icon: '', text: _UNO('.uno:Signature'), visible: false},
 			{type: 'spacer',  id: 'permissionspacer'},
 			this._generateHtmlItem('documentstatus', 2),					// spreadsheet, text, presentation, drawing
-			{type: 'customtoolitem',  id: 'multi-page-view', command: 'multipageview', text: _('Multi Page View'), icon: 'twopages.svg', dataPriority: 10,  visible: false}, // text
+			{type: 'customtoolitem',  id: 'multi-page-view', command: 'multipageview', text: _('Multi Page View'), dataPriority: 10,  visible: false}, // text
 			{type: 'customtoolitem',  id: 'prev', command: 'prev', text: _UNO('.uno:PageUp', 'text'), pressAndHold: true, dataPriority: 9},
 			{type: 'customtoolitem',  id: 'next', command: 'next', text: _UNO('.uno:PageDown', 'text'), pressAndHold: true, dataPriority: 9},
 			{type: 'separator', id: 'prevnextbreak', orientation: 'vertical', dataPriority: 9},

browser/src/canvas/sections/TilesSection.ts

@@ -717,21 +717,22 @@ class Dispatcher {
 		};
 
 		this.actionsMap['multipageview'] = function () {
-			const buttonElement = document.getElementById('multi-page-view');
-			const imageElement = buttonElement.querySelector('img');
-			let source = imageElement.src;
+			if (app.activeDocument && app.activeDocument.activeView) {
+				let commandState = false;
+				if (app.activeDocument.activeView.type === 'ViewLayoutMultiPage') {
+					app.activeDocument.activeView = new ViewLayoutWriter();
+				} else {
+					app.activeDocument.activeView = new ViewLayoutMultiPage();
+					commandState = true;
+				}
 
-			if (source.indexOf('twopages.svg') !== -1) {
-				source = source.replace('twopages.svg', 'twopages_a.svg');
-				app.activeDocument.activeView = new ViewLayoutMultiPage();
-			} else {
-				source = source.replace('twopages_a.svg', 'twopages.svg');
-				app.activeDocument.activeView = new ViewLayoutWriter();
+				app.map.fire('commandstatechanged', {
+					commandName: 'multipageview',
+					state: commandState ? 'true' : 'false',
+				});
+				app.activeDocument.activeView.sendClientVisibleArea();
+				app.sectionContainer.requestReDraw();
 			}
-
-			imageElement.src = source;
-			app.activeDocument.activeView.sendClientVisibleArea();
-			app.sectionContainer.requestReDraw();
 		};
 	}
 

browser/src/control/Control.StatusBar.js

@@ -3613,11 +3613,9 @@ window.L.CanvasTileLayer = window.L.Layer.extend({
 
 		const size = [documentEndPos.x - documentPos.x, documentEndPos.y - documentPos.y];
 
-		if (app.activeDocument.activeView.type !== 'ViewLayoutMultiPage') {
-			app.activeDocument.activeView.viewedRectangle = new cool.SimpleRectangle(
-				documentPos.x * app.pixelsToTwips, documentPos.y * app.pixelsToTwips, size[0] * app.pixelsToTwips, size[1] * app.pixelsToTwips
-			);
-		}
+		app.activeDocument.activeView.viewedRectangle = new cool.SimpleRectangle(
+			documentPos.x * app.pixelsToTwips, documentPos.y * app.pixelsToTwips, size[0] * app.pixelsToTwips, size[1] * app.pixelsToTwips
+		);
 	},
 
 	pauseDrawing: function () {

browser/src/docdispatcher.ts

@@ -112,10 +112,7 @@ window.L.WriterTileLayer = window.L.CanvasTileLayer.extend({
 
 		if (sizeChanged) {
 			app.activeDocument.fileSize = new cool.SimplePoint(statusJSON.width, statusJSON.height);
-
-			// Views should be setting view size. But it has time.
-			if (app.activeDocument.activeView.type !== 'ViewLayoutMultiPage')
-				app.activeDocument.activeView.viewSize = app.activeDocument.fileSize.clone();
+			app.activeDocument.activeView.viewSize = app.activeDocument.fileSize.clone();
 
 			this._docType = statusJSON.type;
 			this._updateMaxBounds(true);