Creepso/NuvioStreaming
1
0
Fork 0
mirror of https://github.com/tapframe/NuvioStreaming.git synced 2026-05-18 16:01:44 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

fix: android not registering hold to change profile

Browse source
This commit is contained in:
tapframe 2026-05-16 21:19:35 +05:30
parent da217c96b7
commit bcf1e65903
1 changed files with 16 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
composeApp/src/commonMain/kotlin/com/nuvio/app/features/profiles/ProfileSwitcherTab.kt
View file

@ -56,7 +56,6 @@ import androidx.compose.ui.hapticfeedback.HapticFeedbackType
import androidx.compose.ui.input.pointer.pointerInput import androidx.compose.ui.input.pointer.pointerInput
import androidx.compose.ui.layout.LayoutCoordinates import androidx.compose.ui.layout.LayoutCoordinates
import androidx.compose.ui.layout.ContentScale import androidx.compose.ui.layout.ContentScale
import androidx.compose.ui.layout.boundsInWindow
import androidx.compose.ui.layout.onGloballyPositioned import androidx.compose.ui.layout.onGloballyPositioned
import androidx.compose.ui.platform.LocalDensity import androidx.compose.ui.platform.LocalDensity
import androidx.compose.ui.platform.LocalHapticFeedback import androidx.compose.ui.platform.LocalHapticFeedback
@ -76,6 +75,8 @@ import kotlinx.coroutines.launch
import nuvio.composeapp.generated.resources.* import nuvio.composeapp.generated.resources.*
import org.jetbrains.compose.resources.getString import org.jetbrains.compose.resources.getString
import org.jetbrains.compose.resources.stringResource import org.jetbrains.compose.resources.stringResource
import kotlin.math.max
import kotlin.math.min
@Composable @Composable
fun ProfileSwitcherTab( fun ProfileSwitcherTab(
@ -124,9 +125,9 @@ fun ProfileSwitcherTab(
fun updateDragTarget(localPosition: Offset) { fun updateDragTarget(localPosition: Offset) {
val trigger = triggerCoordinates ?: return val trigger = triggerCoordinates ?: return
val windowPosition = trigger.localToWindow(localPosition) val screenPosition = trigger.localToScreen(localPosition)
val nextTargetProfileIndex = profileBubbleBounds.entries val nextTargetProfileIndex = profileBubbleBounds.entries
.firstOrNull { (_, bounds) -> bounds.contains(windowPosition) } .firstOrNull { (_, bounds) -> bounds.contains(screenPosition) }
?.key ?.key
if (nextTargetProfileIndex != null && nextTargetProfileIndex != dragTargetProfileIndex) { if (nextTargetProfileIndex != null && nextTargetProfileIndex != dragTargetProfileIndex) {
performProfileHoverHaptic() performProfileHoverHaptic()
@ -450,7 +451,7 @@ private fun PopupProfileBubble(
horizontalAlignment = Alignment.CenterHorizontally, horizontalAlignment = Alignment.CenterHorizontally,
modifier = Modifier modifier = Modifier
.onGloballyPositioned { coordinates -> .onGloballyPositioned { coordinates ->
onBoundsChanged(coordinates.boundsInWindow()) onBoundsChanged(coordinates.boundsOnScreen())
} }
.graphicsLayer { .graphicsLayer {
alpha = itemAlpha.value alpha = itemAlpha.value
@ -565,6 +566,17 @@ private fun PopupProfileBubble(
} }
} }
private fun LayoutCoordinates.boundsOnScreen(): Rect {
val topLeft = localToScreen(Offset.Zero)
val bottomRight = localToScreen(Offset(size.width.toFloat(), size.height.toFloat()))
return Rect(
left = min(topLeft.x, bottomRight.x),
top = min(topLeft.y, bottomRight.y),
right = max(topLeft.x, bottomRight.x),
bottom = max(topLeft.y, bottomRight.y),
)
}
/** /**
* Compact inline PIN entry shown inside the popup when a PIN-protected * Compact inline PIN entry shown inside the popup when a PIN-protected
* profile is tapped. * profile is tapped.