Skip to content
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

Fix global border colors on old UI in bridge #205

Merged
merged 1 commit into from
Oct 25, 2023
Merged

Fix global border colors on old UI in bridge #205

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
9 changes: 6 additions & 3 deletions ide-laf-bridge/src/main/kotlin/org/jetbrains/jewel/bridge/theme/BridgeGlobalColors.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,9 @@
package org.jetbrains.jewel.bridge.theme

import com.intellij.ide.ui.laf.darcula.DarculaUIUtil
import com.intellij.ui.JBColor
import org.jetbrains.jewel.bridge.retrieveColorOrUnspecified
import org.jetbrains.jewel.bridge.toComposeColorOrUnspecified
import org.jetbrains.jewel.foundation.BorderColors
import org.jetbrains.jewel.foundation.GlobalColors
import org.jetbrains.jewel.foundation.OutlineColors
Expand All @@ -15,9 +18,9 @@ fun GlobalColors.Companion.readFromLaF() =

fun BorderColors.Companion.readFromLaF() =
BorderColors(
normal = retrieveColorOrUnspecified("Component.borderColor"),
focused = retrieveColorOrUnspecified("Component.focusedBorderColor"),
disabled = retrieveColorOrUnspecified("*.disabledBorderColor"),
normal = JBColor.border().toComposeColorOrUnspecified(),
focused = DarculaUIUtil.getOutlineColor(true, true).toComposeColorOrUnspecified(),
disabled = DarculaUIUtil.getOutlineColor(false, false).toComposeColorOrUnspecified(),
)

fun OutlineColors.Companion.readFromLaF() =
Expand Down