Skip to content
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 5 additions & 1 deletion src/main/java/com/mapconductor/longdo/LongdoAnnotations.kt
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,7 @@ import androidx.compose.ui.unit.IntSize
import androidx.compose.ui.unit.dp
import com.mapconductor.compose.info.InfoBubbleEntry
import com.mapconductor.core.marker.DefaultMarkerIcon
import com.mapconductor.core.marker.iconRevision
import com.mapconductor.core.marker.MarkerAnimation
import com.mapconductor.core.marker.MarkerState
import com.mapconductor.settings.Settings
Expand Down Expand Up @@ -67,7 +68,10 @@ internal fun LongdoMarkerOverlay(
onDragMove: (marker: MarkerState, devicePx: Offset) -> Unit = { _, _ -> },
) {
val density = LocalDensity.current.density
val bitmapIcon = remember(marker.icon) { (marker.icon ?: DefaultMarkerIcon()).toBitmapIcon() }
// URL の画像が届くと、アイコンは同じインスタンスのまま見た目だけ変わる。iconRevision が
// そのとき増えるので、それもキーにする(読むことで描き直しも起きる)。
val bitmapIcon =
remember(marker.icon, marker.iconRevision) { (marker.icon ?: DefaultMarkerIcon()).toBitmapIcon() }
val widthPx = bitmapIcon.size.width
val heightPx = bitmapIcon.size.height
val anchor = bitmapIcon.anchor
Expand Down
Loading