Skip to content

fix(ui): release held mouse buttons when a Compose screen closes or loses focus #1217

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
awruff merged 1 commit into from
Oct 19, 2026
Merged

fix(ui): release held mouse buttons when a Compose screen closes or loses focus #1217

Show file tree
Hide file tree
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
41 changes: 25 additions & 16 deletions minecraft/src/main/kotlin/org/polyfrost/oneconfig/internal/ui/compose/ComposeScreen.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -606,6 +606,8 @@ abstract class ComposeScreen(
showing = false
sceneContextOrNull?.sync()
ComposeSceneContextImpl.resetPointerIcon()
releaseHeldButtons()
consumedButtons.clear()
releaseScene()
super.removed()
}
Expand Down Expand Up @@ -663,6 +665,8 @@ abstract class ComposeScreen(
val metricsChanged = syncSceneMetrics()

val focused = client.isWindowActive
if (wasFocused && !focused) releaseHeldButtons()
wasFocused = focused
if (focused) {
val pointerPosition = pointerPosition()
if (pointerPosition != lastPointer) {
Expand Down Expand Up @@ -839,24 +843,29 @@ abstract class ComposeScreen(

protected open fun handleMouseClicked(button: Int): Boolean = false

private var wasFocused = true

/**
* Compose never receives a release that happens after this screen closes or the window loses focus, so buttons are
* treated as held forever blocking all other mouse input
*/
private fun releaseHeldButtons() {
// cancel first so these releases only clear the held mouse buttons instead of clicking
withScene { it.cancelPointerInput() }
sendMouseButtonEvent(PointerEventType.Release, InputConstants.MOUSE_BUTTON_LEFT)
sendMouseButtonEvent(PointerEventType.Release, InputConstants.MOUSE_BUTTON_RIGHT)
sendMouseButtonEvent(PointerEventType.Release, InputConstants.MOUSE_BUTTON_MIDDLE)
}

private fun sendMouseButtonEvent(type: PointerEventType, button: Int) {
withScene {
it.sendPointerEvent(
type,
//? if sdl {
button = when (button) {
InputConstants.MOUSE_BUTTON_LEFT -> PointerButton.Primary
InputConstants.MOUSE_BUTTON_RIGHT -> PointerButton.Secondary
InputConstants.MOUSE_BUTTON_MIDDLE -> PointerButton.Tertiary
else -> PointerButton(button - 1)
},
//?} else {
/*// PointerButton indices match GLFW button numbers (Primary = 0, Secondary = 1, ...)
button = if (button >= 0) PointerButton(button) else null,
*///?}
position = pointerPosition()
)
val pointerButton = when (button) {
InputConstants.MOUSE_BUTTON_LEFT -> PointerButton.Primary
InputConstants.MOUSE_BUTTON_RIGHT -> PointerButton.Secondary
InputConstants.MOUSE_BUTTON_MIDDLE -> PointerButton.Tertiary
// side buttons are handled before this, and Compose ignores other clicks while one is held
else -> return
}
withScene { it.sendPointerEvent(type, button = pointerButton, position = pointerPosition()) }
}

private fun sendScrollEvent(scrollX: Double, scrollY: Double) {
Expand Down
10 changes: 6 additions & 4 deletions ...ternal/src/main/kotlin/org/polyfrost/oneconfig/internal/ui/hud/screens/HudDesignStudio.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3268,8 +3268,9 @@ private fun LegacyHudPreviewCard(
}
}
}
.safePointerEvent(PointerEventType.Release) {
if (!dragStarted && pressPos != null) {
.safePointerEvent(PointerEventType.Release) { event ->
// ignore the fake release Compose sends when a press is interrupted, such as by alt-tabbing
if (!dragStarted && pressPos != null && event.changes.none { it.isConsumed }) {
onCardClick(hud)
}
pressPos = null
Expand Down Expand Up @@ -3350,8 +3351,9 @@ private fun ComposeHudPreviewCard(
}
}
}
.safePointerEvent(PointerEventType.Release) {
if (!dragStarted && pressPos != null) {
.safePointerEvent(PointerEventType.Release) { event ->
// ignore the fake release Compose sends when a press is interrupted, such as by alt-tabbing
if (!dragStarted && pressPos != null && event.changes.none { it.isConsumed }) {
onCardClick(hud)
}
pressPos = null
Expand Down
Loading