Dockery/Trilium
1
0
Fork 0
mirror of https://github.com/zadam/trilium.git synced 2025-10-31 02:16:05 +01:00
Code Issues Packages Projects Releases Activity

fix(touch_bar): jerkiness when zooming

Browse Source
This commit is contained in:
Elian Doran
2025-03-08 23:13:58 +02:00
parent 323f42873f
commit cbbe10ba67
2 changed files with 10 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/public/app/widgets/geo_map.ts
View File

@@ -52,8 +52,6 @@ export default class GeoMapWidget extends NoteContextAwareWidget {
this.initCallback(L); this.initCallback(L);
} }
map.addEventListener("zoom", () => this.triggerCommand("refreshTouchBar"));
L.tileLayer("https://tile.openstreetmap.org/{z}/{x}/{y}.png", { L.tileLayer("https://tile.openstreetmap.org/{z}/{x}/{y}.png", {
attribution: '&copy; <a href="https://www.openstreetmap.org/copyright">OpenStreetMap</a> contributors', attribution: '&copy; <a href="https://www.openstreetmap.org/copyright">OpenStreetMap</a> contributors',
detectRetina: true detectRetina: true

10
src/public/app/widgets/type_widgets/geo_map.ts
View File

@@ -105,6 +105,7 @@ export default class GeoMapTypeWidget extends TypeWidget {
private currentMarkerData: Record<string, Marker>; private currentMarkerData: Record<string, Marker>;
private currentTrackData: Record<string, GPX>; private currentTrackData: Record<string, GPX>;
private gpxLoaded?: boolean; private gpxLoaded?: boolean;
private ignoreNextZoomEvent?: boolean;
static getType() { static getType() {
return "geoMap"; return "geoMap";
@@ -144,6 +145,13 @@ export default class GeoMapTypeWidget extends TypeWidget {
map.on("moveend", updateFn); map.on("moveend", updateFn);
map.on("zoomend", updateFn); map.on("zoomend", updateFn);
map.on("click", (e) => this.#onMapClicked(e)); map.on("click", (e) => this.#onMapClicked(e));
map.on("zoom", () => {
if (!this.ignoreNextZoomEvent) {
this.triggerCommand("refreshTouchBar");
}
this.ignoreNextZoomEvent = false;
});
} }
async #restoreViewportAndZoom() { async #restoreViewportAndZoom() {
@@ -383,6 +391,7 @@ export default class GeoMapTypeWidget extends TypeWidget {
buildTouchBarCommand({ TouchBar }: CommandListenerData<"buildTouchBar">) { buildTouchBarCommand({ TouchBar }: CommandListenerData<"buildTouchBar">) {
const map = this.geoMapWidget.map; const map = this.geoMapWidget.map;
const that = this;
if (!map) { if (!map) {
return; return;
} }
@@ -394,6 +403,7 @@ export default class GeoMapTypeWidget extends TypeWidget {
minValue: map.getMinZoom(), minValue: map.getMinZoom(),
maxValue: map.getMaxZoom(), maxValue: map.getMaxZoom(),
change(newValue) { change(newValue) {
that.ignoreNextZoomEvent = true;
map.setZoom(newValue); map.setZoom(newValue);
}, },
}), }),