weyne/DCSOlympus
1
0
Fork 0
mirror of https://github.com/Pax1601/DCSOlympus.git synced 2025-10-29 16:56:34 +00:00
Code Issues Packages Projects Releases Wiki Activity

Added check on map zooming to disable box select

Browse Source
This commit is contained in:
Pax1601 2024-07-07 19:12:56 +02:00
parent 1dceb0b421
commit 98862d917c
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
frontend/react/src/map/map.ts
View File

@ -72,7 +72,7 @@ export class Map extends L.Map {
#temporaryMarkers: TemporaryUnitMarker[] = [];
#selecting: boolean = false;
#isSelecting: boolean = false;
#isZooming: boolean = false;
#previousZoom: number = 0;
@ -96,7 +96,7 @@ export class Map extends L.Map {
#waitingForDoubleClick: boolean = false;
#doubleClickTimer: number = 0;
#longPressTimer: number = 0;
#dragging: boolean = false;
#isDragging: boolean = false;
/**
*
@ -801,19 +801,19 @@ export class Map extends L.Map {
#onContextMenu(e: any) {}
#onDragStart(e: any) {
this.#dragging = true;
this.#isDragging = true;
}
#onDragEnd(e: any) {
this.#dragging = false;
this.#isDragging = false;
}
#onSelectionStart(e: any) {
this.#selecting = true;
this.#isSelecting = true;
}
#onSelectionEnd(e: any) {
this.#selecting = false;
this.#isSelecting = false;
clearTimeout(this.#leftClickTimer);
this.#preventLeftClick = true;
this.#leftClickTimer = window.setTimeout(() => {
@ -829,7 +829,7 @@ export class Map extends L.Map {
#onMouseDown(e: any) {
this.#longPressTimer = window.setTimeout(()=> {
if (!this.#dragging)
if (!this.#isDragging && !this.#isZooming)
if (e.type === "touchstart")
document.dispatchEvent(new CustomEvent("mapForceBoxSelect", {detail: e}));
else