Merge branch 'CollaboraOnline:master' into comment-autosave-state-improvement

Author: rparth07

browser/.eslintignore

@@ -4,5 +4,6 @@
 **/js/sanitize-url.js
 **/js/l10n.js
 **/src/unocommands.js
+**/src/layer/tile/CanvasTileWorker.js
 node_modules
 dist/src

browser/.prettierignore

@@ -4,5 +4,6 @@
 **/js/sanitize-url.js
 **/js/l10n.js
 **/src/unocommands.js
+**/src/layer/tile/CanvasTileWorker.js
 node_modules
 dist/src

browser/Makefile.am

@@ -160,6 +160,20 @@ COOL_CSS_M4 = $(strip $(foreach file,$(COOL_CSS),$(notdir $(file))))
 
 $(eval $(call file_targets,$(COOL_CSS)))
 
+WORKER_NODE_MODULES_JS =\
+	node_modules/fzstd/umd/index.js
+
+$(srcdir)/src/layer/tile/CanvasTileWorker.js: \
+	$(srcdir)/src/layer/tile/CanvasTileWorker.js.m4 \
+	$(srcdir)/src/layer/tile/CanvasTileWorkerSrc.js \
+	$(WORKER_NODE_MODULES_JS)
+
+	@echo "Generating CanvasTileWorker.js..."
+	m4 -PE -DDEBUG=$(ENABLE_DEBUG) \
+		-DNODE_MODULES_JS=$(subst $(SPACE),$(COMMA),$(WORKER_NODE_MODULES_JS)) \
+		-DWORKER_JS=$(srcdir)/src/layer/tile/CanvasTileWorkerSrc.js \
+		$(srcdir)/src/layer/tile/CanvasTileWorker.js.m4 > $@
+
 NODE_MODULES_JS =\
 	$(if $(IS_SEPARATE),node_modules/hammerjs/hammer.js,node_modules/hammerjs/hammer.min.js) \
 	node_modules/dompurify/dist/purify.min.js \
@@ -227,7 +241,7 @@ COOL_JS_LST =\
 	src/layer/tile/SheetSwitch.ts \
 	src/layer/Layer.js \
 	src/layer/tile/SheetGeometry.ts \
-	src/layer/tile/Premult.ts \
+	src/layer/tile/CanvasTileUtils.ts \
 	src/canvas/CanvasSectionProps.js \
 	src/canvas/CanvasSectionContainer.ts \
 	src/canvas/CanvasSectionObject.ts \
@@ -268,6 +282,7 @@ COOL_JS_LST =\
 	src/layer/marker/Cursor.ts \
 	src/layer/vector/CanvasOverlay.ts \
 	src/canvas/sections/ScrollSection.ts \
+	src/layer/tile/CanvasTileWorker.js \
 	src/layer/tile/CanvasTileLayer.js \
 	src/layer/vector/CDarkOverlay.ts \
 	src/layer/SplitPanesContext.ts \
@@ -1096,6 +1111,7 @@ pot:
 		src/app/DocEvents.ts \
 		src/app/GraphicSelectionMiddleware.ts \
 		src/errormessages.js \
+		src/layer/tile/CanvasTileWorker.js \
 		src/layer/tile/CanvasTileLayer.js \
 		src/canvas/sections/CommentListSection.ts \
 		src/canvas/sections/CommentSection.ts \

browser/css/jsdialogs.css

@@ -2231,8 +2231,9 @@ kbd,
 	margin: 0;
 }
 
-#DocumentPropertiesDialog #customprops .jsdialog.ui-scrollwindow {
-	max-height: min-content;
+#DocumentPropertiesDialog #customprops #CustomInfoPage > .jsdialog.ui-scrollwindow:not(.formulabar) {
+	height: 540px;
+	max-height: none;
 }
 
 #ServerAuditDialog #ServerAuditDialog-mainbox {