Merge branch 'main' into 260-treeelementselection-appearance-issue-fo…

…r-last-and-first-element
JetBrains · Dec 1, 2023 · fdcd35b · fdcd35b
2 parents bf31f5d + 6534c27
commit fdcd35b
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 5 deletions.
diff --git a/buildSrc/src/main/kotlin/org/jetbrains/jewel/buildlogic/demodata/AndroidStudioReleases.kt b/buildSrc/src/main/kotlin/org/jetbrains/jewel/buildlogic/demodata/AndroidStudioReleases.kt
@@ -1,8 +1,8 @@
 package org.jetbrains.jewel.buildlogic.demodata
 
 import com.squareup.kotlinpoet.ClassName
-import gradle.kotlin.dsl.accessors._c011fd04eb69b06af6f445fec200c5f6.main
-import gradle.kotlin.dsl.accessors._c011fd04eb69b06af6f445fec200c5f6.sourceSets
+import gradle.kotlin.dsl.accessors._191c70c30b85215d3734a2125d755542.main
+import gradle.kotlin.dsl.accessors._191c70c30b85215d3734a2125d755542.sourceSets
 import kotlinx.serialization.json.Json
 import kotlinx.serialization.json.decodeFromStream
 import org.gradle.api.DefaultTask

diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
@@ -1,10 +1,10 @@
 [versions]
-composeDesktop = "1.5.10"
+composeDesktop = "1.5.11"
 coroutines = "1.7.3"
 detekt = "1.23.1"
 dokka = "1.8.20"
 idea232 = "232.10227.8"
-idea233 = "233.11799.67-EAP-SNAPSHOT"
+idea233 = "233.11799.196-EAP-SNAPSHOT"
 ideaGradlePlugin = "1.16.0"
 javaSarif = "2.0"
 jna = "5.13.0"

diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.4-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.5-all.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git a/ide-laf-bridge/src/main/kotlin/org/jetbrains/jewel/bridge/theme/IntUiBridge.kt b/ide-laf-bridge/src/main/kotlin/org/jetbrains/jewel/bridge/theme/IntUiBridge.kt
@@ -611,9 +611,11 @@ private fun readScrollbarStyle(isDark: Boolean) =
         colors = ScrollbarColors(
             // See ScrollBarPainter.THUMB_OPAQUE_BACKGROUND
             thumbBackground = retrieveColorOrUnspecified("ScrollBar.Mac.Transparent.thumbColor")
+                .let { if (it.alpha == 0f) Color.Unspecified else it } // See https://github.com/JetBrains/jewel/issues/259
                 .takeOrElse { if (isDark) Color(0x59808080) else Color(0x33000000) },
             // See ScrollBarPainter.THUMB_OPAQUE_HOVERED_BACKGROUND
             thumbBackgroundHovered = retrieveColorOrUnspecified("ScrollBar.Mac.Transparent.hoverThumbColor")
+                .let { if (it.alpha == 0f) Color.Unspecified else it } // See https://github.com/JetBrains/jewel/issues/259
                 .takeOrElse { if (isDark) Color(0x8C808080) else Color(0x80000000) },
         ),
         metrics = ScrollbarMetrics(