Merge ef1bc8903c into b5ca5d4dc1

components/SplitPane/demo/src/jvmMain/kotlin/org/jetbrains/compose/splitpane/demo/Main.kt

@@ -1,17 +1,34 @@
 package org.jetbrains.compose.splitpane.demo
 
 import androidx.compose.foundation.background
-import androidx.compose.foundation.layout.*
+import androidx.compose.foundation.layout.Arrangement
+import androidx.compose.foundation.layout.Box
+import androidx.compose.foundation.layout.Column
+import androidx.compose.foundation.layout.Row
+import androidx.compose.foundation.layout.fillMaxHeight
+import androidx.compose.foundation.layout.fillMaxSize
+import androidx.compose.foundation.layout.padding
+import androidx.compose.foundation.layout.width
+import androidx.compose.material.Button
 import androidx.compose.material.MaterialTheme
-import androidx.compose.runtime.*
+import androidx.compose.material.OutlinedTextField
+import androidx.compose.material.Text
+import androidx.compose.runtime.getValue
+import androidx.compose.runtime.mutableStateOf
+import androidx.compose.runtime.remember
+import androidx.compose.runtime.setValue
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.graphics.SolidColor
 import androidx.compose.ui.input.pointer.PointerIcon
 import androidx.compose.ui.input.pointer.pointerHoverIcon
+import androidx.compose.ui.text.font.FontWeight
 import androidx.compose.ui.unit.dp
 import androidx.compose.ui.window.singleWindowApplication
-import org.jetbrains.compose.splitpane.*
+import org.jetbrains.compose.splitpane.ExperimentalSplitPaneApi
+import org.jetbrains.compose.splitpane.HorizontalSplitPane
+import org.jetbrains.compose.splitpane.VerticalSplitPane
+import org.jetbrains.compose.splitpane.rememberSplitPaneState
 import java.awt.Cursor
 
 private fun Modifier.cursorForHorizontalResize(): Modifier =
@@ -24,40 +41,69 @@ fun main() = singleWindowApplication(
     MaterialTheme {
         val splitterState = rememberSplitPaneState()
         val hSplitterState = rememberSplitPaneState()
-        HorizontalSplitPane(
+        var delta by remember { mutableStateOf("20") }
-            splitPaneState = splitterState
+        var percentage by remember { mutableStateOf("0.20") }
-        ) {
+        Row {
-            first(20.dp) {
+            Column(verticalArrangement = Arrangement.spacedBy(10.dp), modifier = Modifier.padding(10.dp).width(180.dp)) {
-                Box(Modifier.background(Color.Red).fillMaxSize())
+                Text("Action panel", fontWeight = FontWeight.Bold)
-            }
+                Button(onClick = { splitterState.moveEnabled = !splitterState.moveEnabled }) {
-            second(50.dp) {
+                    Text(if (splitterState.moveEnabled) "Freeze V" else "Unfreeze V")
-                VerticalSplitPane(splitPaneState = hSplitterState) {
+                }
-                    first(50.dp) {
+                Button(onClick = { hSplitterState.moveEnabled = !hSplitterState.moveEnabled }) {
-                        Box(Modifier.background(Color.Blue).fillMaxSize())
+                    Text(if (hSplitterState.moveEnabled) "Freeze H" else "Unfreeze H")
-                    }
+                }
-                    second(20.dp) {
+
-                        Box(Modifier.background(Color.Green).fillMaxSize())
+                OutlinedTextField(value = delta, onValueChange = { delta = it }, label = { Text("Delta") })
-                    }
+                Button(onClick = { delta.toFloatOrNull()?.let { splitterState.dispatchRawMovement(it) } }) {
+                    Text("Add delta V")
+                }
+                Button(onClick = { delta.toFloatOrNull()?.let { hSplitterState.dispatchRawMovement(it) } }) {
+                    Text("Add delta H")
+                }
+
+                OutlinedTextField(value = percentage, onValueChange = { percentage = it }, label = { Text("Fraction") })
+                Button(onClick = { percentage.toFloatOrNull()?.let { splitterState.positionPercentage = it } }) {
+                    Text("Set fraction V")
+                }
+                Button(onClick = { percentage.toFloatOrNull()?.let { hSplitterState.positionPercentage = it } }) {
+                    Text("Set fraction H")
                 }
             }
-            splitter {
+            HorizontalSplitPane(
-                visiblePart {
+                splitPaneState = splitterState
-                    Box(
+            ) {
-                        Modifier
+                first(20.dp) {
-                            .width(1.dp)
+                    Box(Modifier.background(Color.Red).fillMaxSize())
-                            .fillMaxHeight()
-                            .background(MaterialTheme.colors.background)
-                    )
                 }
-                handle {
+                second(50.dp) {
-                    Box(
+                    VerticalSplitPane(splitPaneState = hSplitterState) {
-                        Modifier
+                        first(50.dp) {
-                            .markAsHandle()
+                            Box(Modifier.background(Color.Blue).fillMaxSize())
-                            .cursorForHorizontalResize()
+                        }
-                            .background(SolidColor(Color.Gray), alpha = 0.50f)
+                        second(20.dp) {
-                            .width(9.dp)
+                            Box(Modifier.background(Color.Green).fillMaxSize())
-                            .fillMaxHeight()
+                        }
-                    )
+                    }
+                }
+                splitter {
+                    visiblePart {
+                        Box(
+                            Modifier
+                                .width(1.dp)
+                                .fillMaxHeight()
+                                .background(MaterialTheme.colors.background)
+                        )
+                    }
+                    handle {
+                        Box(
+                            Modifier
+                                .markAsHandle()
+                                .cursorForHorizontalResize()
+                                .background(SolidColor(Color.Gray), alpha = 0.50f)
+                                .width(9.dp)
+                                .fillMaxHeight()
+                        )
+                    }
                 }
             }
         }

components/SplitPane/library/src/commonMain/kotlin/org/jetbrains/compose/splitpane/SplitPaneState.kt

@@ -11,10 +11,18 @@ class SplitPaneState(
 ) {
 
     var moveEnabled by mutableStateOf(moveEnabled)
-        internal set
 
-    var positionPercentage by mutableStateOf(initialPositionPercentage)
+    private var _positionPercentage by mutableStateOf(initialPositionPercentage)
-        internal set
+    var positionPercentage: Float
+        get() = _positionPercentage
+        set(value) {
+            if (maxPosition == Float.POSITIVE_INFINITY) {
+                _positionPercentage = value
+            } else {
+                val movableArea = maxPosition - minPosition
+                _positionPercentage = (movableArea * value).coerceIn(0f, movableArea) / movableArea
+            }
+        }
 
     internal var minPosition: Float = 0f