Add horizontal scroll bar to model content panes

gradle-client/src/jvmMain/kotlin/org/gradle/client/ui/composables/FailureContent.kt

@@ -1,27 +1,23 @@
 package org.gradle.client.ui.composables
 
-import androidx.compose.foundation.horizontalScroll
 import androidx.compose.foundation.layout.Column
-import androidx.compose.foundation.layout.fillMaxSize
-import androidx.compose.foundation.rememberScrollState
 import androidx.compose.foundation.text.selection.SelectionContainer
 import androidx.compose.material3.MaterialTheme
 import androidx.compose.material3.Text
 import androidx.compose.runtime.Composable
-import androidx.compose.ui.Modifier
 import androidx.compose.ui.text.font.FontFamily
 
 @Composable
 fun FailureContent(exception: Exception) {
-    Column(
-        modifier = Modifier.fillMaxSize().horizontalScroll(rememberScrollState())
-    ) {
-        SelectionContainer {
-            Text(
-                text = exception.stackTraceToString(),
-                style = MaterialTheme.typography.labelSmall.copy(fontFamily = FontFamily.Monospace),
-                color = MaterialTheme.colorScheme.error,
-            )
+    Column {
+        horizontalScrollContent {
+            SelectionContainer {
+                Text(
+                    text = exception.stackTraceToString(),
+                    style = MaterialTheme.typography.labelSmall.copy(fontFamily = FontFamily.Monospace),
+                    color = MaterialTheme.colorScheme.error,
+                )
+            }
         }
     }
 }

gradle-client/src/jvmMain/kotlin/org/gradle/client/ui/composables/Scroll.kt

@@ -0,0 +1,41 @@
+package org.gradle.client.ui.composables
+
+import androidx.compose.foundation.HorizontalScrollbar
+import androidx.compose.foundation.horizontalScroll
+import androidx.compose.foundation.layout.*
+import androidx.compose.foundation.rememberScrollState
+import androidx.compose.foundation.rememberScrollbarAdapter
+import androidx.compose.runtime.Composable
+import androidx.compose.ui.Alignment
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.unit.dp
+
+
+@Composable
+fun horizontalScrollContent(
+    content: @Composable ColumnScope.() -> Unit,
+) {
+    Box(
+        modifier = Modifier.fillMaxSize()
+    ) {
+        val stateHorizontal = rememberScrollState(0)
+
+        Box(
+            modifier = Modifier
+                .fillMaxSize()
+                .padding(bottom = 12.dp)
+                .horizontalScroll(stateHorizontal)
+        ) {
+            Column {
+                content()
+            }
+        }
+
+        HorizontalScrollbar(
+            modifier = Modifier
+                .align(Alignment.BottomStart)
+                .fillMaxWidth(),
+            adapter = rememberScrollbarAdapter(stateHorizontal)
+        )
+    }
+}

gradle-client/src/jvmMain/kotlin/org/gradle/client/ui/connected/actions/GetBuildEnvironment.kt

@@ -4,6 +4,7 @@ import androidx.compose.foundation.layout.ColumnScope
 import androidx.compose.material3.MaterialTheme
 import androidx.compose.material3.Text
 import androidx.compose.runtime.Composable
+import org.gradle.client.ui.composables.horizontalScrollContent
 import org.gradle.tooling.model.build.BuildEnvironment
 
 class GetBuildEnvironment : GetModelAction<BuildEnvironment> {
@@ -15,29 +16,31 @@ class GetBuildEnvironment : GetModelAction<BuildEnvironment> {
 
     @Composable
     override fun ColumnScope.ModelContent(model: BuildEnvironment) {
-        Text(
-            text = "Build Environment",
-            style = MaterialTheme.typography.titleMedium
-        )
-        Text(
-            text = "Build Identifier: ${model.buildIdentifier.rootDir}",
-            style = MaterialTheme.typography.labelSmall
-        )
-        Text(
-            text = "Java Home: ${model.java.javaHome}",
-            style = MaterialTheme.typography.labelSmall
-        )
-        Text(
-            text = "JVM Arguments:  ${model.java.jvmArguments}",
-            style = MaterialTheme.typography.labelSmall
-        )
-        Text(
-            text = "Gradle Version: ${model.gradle.gradleVersion}",
-            style = MaterialTheme.typography.labelSmall
-        )
-        Text(
-            text = "Gradle User Home: ${model.gradle.gradleUserHome}",
-            style = MaterialTheme.typography.labelSmall
-        )
+        horizontalScrollContent {
+            Text(
+                text = "Build Environment",
+                style = MaterialTheme.typography.titleMedium
+            )
+            Text(
+                text = "Build Identifier: ${model.buildIdentifier.rootDir}",
+                style = MaterialTheme.typography.labelSmall
+            )
+            Text(
+                text = "Java Home: ${model.java.javaHome}",
+                style = MaterialTheme.typography.labelSmall
+            )
+            Text(
+                text = "JVM Arguments:  ${model.java.jvmArguments}",
+                style = MaterialTheme.typography.labelSmall
+            )
+            Text(
+                text = "Gradle Version: ${model.gradle.gradleVersion}",
+                style = MaterialTheme.typography.labelSmall
+            )
+            Text(
+                text = "Gradle User Home: ${model.gradle.gradleUserHome}",
+                style = MaterialTheme.typography.labelSmall
+            )
+        }
     }
 }

gradle-client/src/jvmMain/kotlin/org/gradle/client/ui/connected/actions/GetGradleBuild.kt

@@ -4,6 +4,7 @@ import androidx.compose.foundation.layout.ColumnScope
 import androidx.compose.material3.MaterialTheme
 import androidx.compose.material3.Text
 import androidx.compose.runtime.Composable
+import org.gradle.client.ui.composables.horizontalScrollContent
 import org.gradle.tooling.model.gradle.GradleBuild
 
 class GetGradleBuild : GetModelAction<GradleBuild> {
@@ -15,21 +16,23 @@ class GetGradleBuild : GetModelAction<GradleBuild> {
 
     @Composable
     override fun ColumnScope.ModelContent(model: GradleBuild) {
-        Text(
-            text = "Gradle Build",
-            style = MaterialTheme.typography.titleMedium
-        )
-        Text(
-            text = "Build Identifier: ${model.buildIdentifier.rootDir}",
-            style = MaterialTheme.typography.labelSmall
-        )
-        Text(
-            text = "Root Project Identifier: ${model.rootProject.projectIdentifier}",
-            style = MaterialTheme.typography.labelSmall
-        )
-        Text(
-            text = "Root Project Name: ${model.rootProject.name}",
-            style = MaterialTheme.typography.labelSmall
-        )
+        horizontalScrollContent {
+            Text(
+                text = "Gradle Build",
+                style = MaterialTheme.typography.titleMedium
+            )
+            Text(
+                text = "Build Identifier: ${model.buildIdentifier.rootDir}",
+                style = MaterialTheme.typography.labelSmall
+            )
+            Text(
+                text = "Root Project Identifier: ${model.rootProject.projectIdentifier}",
+                style = MaterialTheme.typography.labelSmall
+            )
+            Text(
+                text = "Root Project Name: ${model.rootProject.name}",
+                style = MaterialTheme.typography.labelSmall
+            )
+        }
     }
 }

gradle-client/src/jvmMain/kotlin/org/gradle/client/ui/connected/actions/GetGradleProject.kt

@@ -4,6 +4,7 @@ import androidx.compose.foundation.layout.ColumnScope
 import androidx.compose.material3.MaterialTheme
 import androidx.compose.material3.Text
 import androidx.compose.runtime.Composable
+import org.gradle.client.ui.composables.horizontalScrollContent
 import org.gradle.tooling.model.GradleProject
 
 class GetGradleProject : GetModelAction<GradleProject> {
@@ -15,21 +16,23 @@ class GetGradleProject : GetModelAction<GradleProject> {
 
     @Composable
     override fun ColumnScope.ModelContent(model: GradleProject) {
-        Text(
-            text = "Gradle Project",
-            style = MaterialTheme.typography.titleMedium
-        )
-        Text(
-            text = "Root Project Identifier: ${model.projectIdentifier}",
-            style = MaterialTheme.typography.labelSmall
-        )
-        Text(
-            text = "Root Project Name: ${model.name}",
-            style = MaterialTheme.typography.labelSmall
-        )
-        Text(
-            text = "Root Project Description: ${model.description}",
-            style = MaterialTheme.typography.labelSmall
-        )
+        horizontalScrollContent {
+            Text(
+                text = "Gradle Project",
+                style = MaterialTheme.typography.titleMedium
+            )
+            Text(
+                text = "Root Project Identifier: ${model.projectIdentifier}",
+                style = MaterialTheme.typography.labelSmall
+            )
+            Text(
+                text = "Root Project Name: ${model.name}",
+                style = MaterialTheme.typography.labelSmall
+            )
+            Text(
+                text = "Root Project Description: ${model.description}",
+                style = MaterialTheme.typography.labelSmall
+            )
+        }
     }
 }