Skip to content

fix(chat): always use the lightest bg color we can find for the chat input box #5766

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
merged 4 commits into from
May 30, 2025
Merged

fix(chat): always use the lightest bg color we can find for the chat input box #5766

Changes from 3 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
0666f47
fix bg again
bryceitoc9 May 29, 2025
24b0321
lrn 2 kotlin
bryceitoc9 May 30, 2025
5323f8e
Merge branch 'feature/q-lsp-chat' into bryceito/bg-again
bryceitoc9 May 30, 2025
0cb2c44
detekt
bryceitoc9 May 30, 2025
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
20 changes: 15 additions & 5 deletions ...src/software/aws/toolkits/jetbrains/services/amazonq/webview/theme/ThemeBrowserAdapter.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@ class ThemeBrowserAdapter {
}

private fun buildJsCodeToUpdateTheme(theme: AmazonQTheme) = buildString {
val (bg, altBg, inputBg) = determineInputAndBgColor(theme)
appendDarkMode(theme.darkMode)

append("{\n")
Expand All @@ -42,14 +43,14 @@ class ThemeBrowserAdapter {
append(CssVariable.TextColorWeak, theme.inactiveText)
append(CssVariable.TextColorDisabled, theme.inactiveText)

append(CssVariable.Background, theme.editorBackground)
append(CssVariable.BackgroundAlt, theme.background)
append(CssVariable.CardBackground, theme.editorBackground)
append(CssVariable.CardBackgroundAlt, theme.background)
append(CssVariable.Background, bg)
append(CssVariable.BackgroundAlt, altBg)
append(CssVariable.CardBackground, bg)
append(CssVariable.CardBackgroundAlt, altBg)
append(CssVariable.BorderDefault, theme.border)
append(CssVariable.TabActive, theme.activeTab)

append(CssVariable.InputBackground, theme.textFieldBackground)
append(CssVariable.InputBackground, inputBg)

append(CssVariable.ButtonBackground, theme.buttonBackground)
append(CssVariable.ButtonForeground, theme.buttonForeground)
Expand Down Expand Up @@ -110,4 +111,13 @@ class ThemeBrowserAdapter {

// Some font names have characters that require them to be wrapped in quotes in the CSS variable, for example if they have spaces or a period.
private fun Font.toCssFontFamily(fallback: String = "system-ui") = "\"$family\", $fallback"

// darkest = bg, second darkest is alt bg, lightest is input bg
private fun determineInputAndBgColor(theme: AmazonQTheme): Triple<Color, Color, Color> {
val colors = arrayOf(theme.editorBackground, theme.background, theme.textFieldBackground).sortedWith(Comparator.comparing {
// luma calculation for brightness
(0.2126 * it.red) + (0.7152 * it.green) + (0.0722 * it.blue)
})
return Triple(colors[0], colors[1], colors[2])
}
}
Loading