Skip to content

Use JBR API to implement WindowDraggableArea when possible #2674

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
m-sasha merged 2 commits into from
Jan 13, 2026
Merged

Use JBR API to implement WindowDraggableArea when possible #2674

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
626e4c0
Use JBR API to implement WindowDraggableArea when possible.
m-sasha Jan 9, 2026
75d1fc0
Moved JBR API dependency to libs.versions.toml
m-sasha Jan 9, 2026
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
1 change: 1 addition & 0 deletions compose/foundation/foundation/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -131,6 +131,7 @@ if (AndroidXComposePlugin.isMultiplatformEnabled(project)) {
dependsOn(skikoMain)
dependencies {
implementation(libs.kotlinStdlib)
implementation(libs.jbrApi)
}
}
nonJvmMain.dependsOn(skikoMain)
Expand Down
35 changes: 25 additions & 10 deletions .../src/desktopMain/kotlin/androidx/compose/foundation/window/WindowDraggableArea.desktop.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@ import androidx.compose.ui.Modifier
import androidx.compose.ui.input.pointer.pointerInput
import androidx.compose.ui.unit.IntOffset
import androidx.compose.ui.window.WindowScope
import com.jetbrains.JBR
import java.awt.MouseInfo
import java.awt.Point
import java.awt.Window
Expand All @@ -43,18 +44,20 @@ fun WindowScope.WindowDraggableArea(
modifier: Modifier = Modifier,
content: @Composable () -> Unit = {}
) {
val handler = remember { DragHandler(window) }

val windowMoveHandler = remember(window) {
// Currently (Jan 2026), isWindowMoveSupported==true only on Linux
if (JBR.isWindowMoveSupported()) JbrMoveHandler(window) else StandardMoveHandler(window)
}
Box(
modifier = modifier.pointerInput(Unit) {
awaitEachGesture {
awaitFirstDown()
handler.onDragStarted()
windowMoveHandler.startMovingTogetherWithMouse()
}
}
) {
content()
}
},
propagateMinConstraints = true,
content = { content() }
)
}

/**
Expand All @@ -69,9 +72,13 @@ private fun currentPointerLocation(): IntOffset? {
return MouseInfo.getPointerInfo()?.location?.toComposeOffset()
}

private class DragHandler(
private interface WindowMoveHandler {
fun startMovingTogetherWithMouse()
}

private class StandardMoveHandler(
private val window: Window
) {
) : WindowMoveHandler {
private var windowLocationAtDragStart: IntOffset? = null
private var dragStartPoint: IntOffset? = null

Expand All @@ -85,7 +92,7 @@ private class DragHandler(
}
}

fun onDragStarted() {
override fun startMovingTogetherWithMouse() {
dragStartPoint = currentPointerLocation() ?: return
windowLocationAtDragStart = window.location.toComposeOffset()

Expand All @@ -100,6 +107,14 @@ private class DragHandler(
val newLocation = windowLocationAtDragStart + (point - dragStartPoint)
window.setLocation(newLocation.x, newLocation.y)
}
}

private class JbrMoveHandler(
private val window: Window
) : WindowMoveHandler {
private val windowMove = JBR.getWindowMove()

override fun startMovingTogetherWithMouse() {
windowMove.startMovingTogetherWithMouse(window, MouseEvent.BUTTON1)
}
}
2 changes: 2 additions & 0 deletions gradle/libs.versions.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,7 @@ hamcrestCore = "1.3"
hilt = "2.49"
incap = "0.2"
javaxInject = "1"
jbrApi = "1.9.0"
jcodec = "0.2.5"
kotlin = "2.2.20"
kotlinBenchmark = "0.4.11"
Expand Down Expand Up @@ -160,6 +161,7 @@ intellijCore = { module = "com.android.tools.external.com-intellij:intellij-core
intellijAnnotations = { module = "com.intellij:annotations", version = "12.0" }
javapoet = { module = "com.squareup:javapoet", version = "1.13.0" }
javaxInject = { module = "javax.inject:javax.inject", version.ref = "javaxInject" }
jbrApi = { module = "org.jetbrains.runtime:jbr-api", version.ref = "jbrApi" }
jcodec = { module = "org.jcodec:jcodec", version.ref = "jcodec" }
jcodecJavaSe = { module = "org.jcodec:jcodec-javase", version.ref = "jcodec" }
johnrengelmanShadow = { module = "com.github.johnrengelman:shadow", version.ref = "shadow" }
Expand Down