Mouse handling: Improvements for cursor style.

Reset lowestPropagatedBoundSection variable on mouse move event. Because properties are not reset after mouse move. Lingering lowestPropagatedBoundSection property value causes trouble.
ScrollSection: Set the cursor style if mouse is over a scrollbar. And also prevent the event propagation so MouseControl class doesn't get the event. When mouse is over tiles again, MouseControl class should handle the cursor style.
Mouse control: SetCursorType function checks if the text cursor is visible or not. Make the check clearer because we need one more condition there. If we check only the existence of the class, we won't have checked the visibility of the text cursor.

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

Author: gokaysatir

browser/src/canvas/CanvasSectionContainer.ts

@@ -796,6 +796,8 @@ class CanvasSectionContainer {
 					break; // Stop propagation.
 			}
 		}
+
+		this.lowestPropagatedBoundSection = null; // onMouseMove event doesn't clear the mouse positions, so we need to clear the property here.
 	}
 
 	private propagateOnMouseDown(section: CanvasSectionObject, position: Array<number>, e: MouseEvent) {

browser/src/canvas/sections/MouseControl.ts

@@ -130,8 +130,7 @@ class MouseControl extends CanvasSectionObject {
 	private setCursorType() {
 		// If we have blinking cursor visible
 		// we need to change cursor from default style
-		if (app.map._docLayer._cursorMarker)
-			app.map._docLayer._cursorMarker.setMouseCursor();
+		if (app.file.textCursor.visible) this.context.canvas.style.cursor = 'text';
 		else if (app.map._docLayer._docType === 'spreadsheet') {
 			const textCursor =
 				app.file.textCursor.visible &&
@@ -156,6 +155,8 @@ class MouseControl extends CanvasSectionObject {
 					this.context.canvas.classList.add('spreadsheet-cursor');
 				}
 			}
+		} else if (app.map._docLayer._docType === 'presentation') {
+			this.context.canvas.style.cursor = '';
 		}
 	}
 

browser/src/canvas/sections/ScrollSection.ts

@@ -491,6 +491,12 @@ export class ScrollSection extends CanvasSectionObject {
 			this.containerObject.requestReDraw();
 	}
 
+	private setCursorForScrollBar(): void {
+		this.context.canvas.style.cursor = 'pointer';
+		if (this.context.canvas.classList.contains('spreadsheet-cursor'))
+			this.context.canvas.classList.remove('spreadsheet-cursor');
+	}
+
 	private isMouseOnScrollBar (point: cool.SimplePoint): void {
 		const scrollProps: ScrollProperties = (app.activeDocument as DocumentBase).activeView.scrollProperties;
 		const documentAnchor: CanvasSectionObject = app.sectionContainer.getSectionWithName(app.CSections.Tiles.name);
@@ -523,8 +529,9 @@ export class ScrollSection extends CanvasSectionObject {
 		}
 		else this.hideVerticalScrollBar();
 
-		if (this.sectionProperties.mouseIsOnHorizontalScrollBar || this.sectionProperties.mouseIsOnVerticalScrollBar)
-			this.context.canvas.style.cursor = 'pointer';
+		if (this.sectionProperties.mouseIsOnHorizontalScrollBar || this.sectionProperties.mouseIsOnVerticalScrollBar) {
+			this.setCursorForScrollBar();
+		}
 	}
 
 	public onMouseLeave (): void {
@@ -643,8 +650,7 @@ export class ScrollSection extends CanvasSectionObject {
 
 			this.sectionProperties.previousDragDistance[1] = dragDistance[1];
 
-			e.stopPropagation(); // Don't propagate to map.
-			this.stopPropagating(); // Don't propagate to bound sections.
+			this.stopPropagating(); // Don't propagate to other sections.
 		}
 		else if (this.sectionProperties.clickScrollHorizontal && this.containerObject.isDraggingSomething()) {
 			if (!this.sectionProperties.previousDragDistance) {
@@ -660,11 +666,12 @@ export class ScrollSection extends CanvasSectionObject {
 				this.scrollHorizontalWithOffset(actualDistance);
 
 			this.sectionProperties.previousDragDistance[0] = dragDistance[0];
-			e.stopPropagation(); // Don't propagate to map.
-			this.stopPropagating(); // Don't propagate to bound sections.
+			this.stopPropagating(); // Don't propagate to other sections.
 		}
 		else {
 			this.isMouseOnScrollBar(position);
+			if (this.sectionProperties.mouseIsOnVerticalScrollBar || this.sectionProperties.mouseIsOnHorizontalScrollBar)
+				this.stopPropagating(); // Don't propagate to other sections.
 		}
 	}