diff --git a/app/components/map/Land.vue b/app/components/map/Land.vue new file mode 100644 index 0000000..6667ad2 --- /dev/null +++ b/app/components/map/Land.vue @@ -0,0 +1,134 @@ + + + diff --git a/app/components/map/VillageMarker.vue b/app/components/map/VillageMarker.vue deleted file mode 100644 index afdb048..0000000 --- a/app/components/map/VillageMarker.vue +++ /dev/null @@ -1,129 +0,0 @@ - - - diff --git a/app/components/map/WorldMap.vue b/app/components/map/WorldMap.vue index 42a6e0a..6331888 100644 --- a/app/components/map/WorldMap.vue +++ b/app/components/map/WorldMap.vue @@ -1,4 +1,5 @@ diff --git a/app/pages/map/[worldId].vue b/app/pages/map/[worldId].vue index 2902887..1628675 100644 --- a/app/pages/map/[worldId].vue +++ b/app/pages/map/[worldId].vue @@ -165,9 +165,9 @@ const popupAt = (x: number, y: number, below: boolean) => { top: below ? `${p.top + field.value + 4}px` : `${p.top - 4}px`, } } -const tip = computed(() => (hovered.value && hovered.value !== selectedVillage.value && visible.value ? hovered.value : null)) -/** While the map is dragged, the click menu stays hidden. */ +/** While the map is dragged, the click menu and the hover popup stay hidden. */ const dragging = ref(false) +const tip = computed(() => (hovered.value && hovered.value !== selectedVillage.value && visible.value && !dragging.value ? hovered.value : null)) const menu = computed(() => (selectedVillage.value && visible.value && !dragging.value ? selectedVillage.value : null)) function onDragMove(dx: number, dy: number) { dragging.value = true