Skip to content

Size the info bubble by the icon's real extent #6

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
wf9a5m75 merged 1 commit into from
Oct 23, 2026
Merged

Size the info bubble by the icon's real extent #6

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
9 changes: 8 additions & 1 deletion src/main/java/com/mapconductor/compose/map/MapViewBase.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,7 @@ import com.mapconductor.compose.marker.MarkerAnimationOverlayLayer
import com.mapconductor.compose.polygon.LocalPolygonCollector
import com.mapconductor.compose.polyline.LocalPolylineCollector
import com.mapconductor.compose.raster.LocalRasterLayerCollector
import com.mapconductor.core.InternalMapConductorApi
import com.mapconductor.core.OnMapLoadedHandler
import com.mapconductor.core.ResourceProvider
import com.mapconductor.core.circle.CircleCapableInterface
Expand All @@ -64,6 +65,7 @@ import com.mapconductor.core.map.ScreenProjectionRequirement
import com.mapconductor.core.map.resolveMapAttributions
import com.mapconductor.core.marker.MarkerCapableInterface
import com.mapconductor.core.map.VectorStyleSupportKey
import com.mapconductor.core.marker.MarkerIconExtent
import com.mapconductor.core.marker.MarkerRenderingSupportKey
import com.mapconductor.core.polygon.PolygonCapableInterface
import com.mapconductor.core.polyline.PolylineCapableInterface
Expand All @@ -77,6 +79,7 @@ import kotlinx.coroutines.flow.distinctUntilChanged
import kotlinx.coroutines.flow.map
import kotlinx.coroutines.flow.update

@OptIn(InternalMapConductorApi::class)
@Composable
fun <
SpecificState : MapViewStateInterface<*>,
Expand Down Expand Up @@ -360,7 +363,11 @@ fun <
if (icon != null) {
val px =
ResourceProvider.dpToPx(icon.iconSize.value) * icon.scale
resolvedIconSize = Size(px.toFloat(), px.toFloat())
// anchor / infoAnchor はアイコンの実寸に対する割合（既定アイコンは
// ラベルの分だけピン本体より広いことがある）。
val extent = MarkerIconExtent.ratio(icon)
resolvedIconSize =
Size(px.toFloat() * extent.width, px.toFloat() * extent.height)
iconOffset = icon.anchor
infoAnchorOffset = icon.infoAnchor
} else {
Expand Down
Loading