Skip to content

Fix InfoWindow when provided view already has parent #2567

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
mar-v-in merged 1 commit into from
Nov 16, 2024
Merged

Fix InfoWindow when provided view already has parent #2567

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: 7 additions & 2 deletions ...-services-maps/core/mapbox/src/main/kotlin/org/microg/gms/maps/mapbox/model/InfoWindow.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,12 @@ import kotlin.math.*
*/

fun IInfoWindowAdapter.getInfoWindowViewFor(marker: IMarkerDelegate, mapContext: MapContext): View? {
getInfoWindow(marker).unwrap<View?>()?.let { return it }
getInfoWindow(marker).unwrap<View?>()?.let { view ->
return view.apply {
// Remove any previous parents mistakenly added by the client
parent?.let { (it as ViewManager).removeView(this) }
}
}

getInfoContents(marker).unwrap<View>()?.let { view ->
// Detach from previous BubbleLayout parent, if exists
Expand Down Expand Up @@ -95,7 +100,7 @@ class InfoWindow internal constructor(
/**
* Close this [InfoWindow] if it is visible, otherwise calling this will do nothing.
*
* @param silent `OnInfoWindowCloseListener` is only called if `silent` is not `false`
* @param silent `OnInfoWindowCloseListener` is only called if `silent` is `false`
*/
fun close(silent: Boolean = false) {
if (isVisible) {
Expand Down