Skip to content

Commit 525dd3b

Browse files
committed
refactor(ui): update background colors and borders
- Standardize background colors using `JBColor(0xEAEEF7, 0x2d2f30)` across components. - Remove redundant background and border settings. - Adjust layout and border configurations for consistency.
1 parent cc762f1 commit 525dd3b

File tree

5 files changed

+18
-17
lines changed

5 files changed

+18
-17
lines changed

core/src/main/kotlin/cc/unitmesh/devti/inline/ChatSketchView.kt

Lines changed: 11 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,7 @@ import com.intellij.ui.components.JBLabel
2626
import com.intellij.ui.components.JBScrollPane
2727
import com.intellij.ui.components.panels.VerticalLayout
2828
import com.intellij.ui.dsl.builder.panel
29+
import com.intellij.util.ui.JBEmptyBorder
2930
import com.intellij.util.ui.JBUI
3031
import com.intellij.util.ui.UIUtil
3132
import kotlinx.coroutines.flow.cancellable
@@ -48,18 +49,17 @@ class ChatSketchView(val project: Project, val editor: Editor?, private val show
4849

4950
private var myList = JPanel(VerticalLayout(JBUI.scale(0))).apply {
5051
this.isOpaque = true
51-
this.background = UIUtil.getLabelBackground()
52+
this.background = JBColor(0xEAEEF7, 0x2d2f30)
5253
}
5354

5455
private var userPrompt: JPanel = JPanel(BorderLayout()).apply {
5556
this.isOpaque = true
56-
this.background = JBUI.CurrentTheme.CustomFrameDecorations.titlePaneInactiveBackground()
57+
this.background = JBColor(0xEAEEF7, 0x2d2f30)
5758
this.border = JBUI.Borders.empty(10, 0)
5859
}
5960

6061
private var contentPanel = JPanel(BorderLayout()).apply {
6162
this.isOpaque = true
62-
this.background = UIUtil.getLabelBackground()
6363
}
6464

6565
private var panelContent: DialogPanel = panel {
@@ -103,14 +103,19 @@ class ChatSketchView(val project: Project, val editor: Editor?, private val show
103103
}
104104

105105
override fun onSubmit(component: AutoDevInputSection, trigger: AutoDevInputTrigger) {
106-
val prompt = component.text
106+
var prompt = component.text
107107
component.text = ""
108108

109109
if (prompt.isEmpty() || prompt.isBlank()) {
110110
component.showTooltip(AutoDevBundle.message("chat.input.tips"))
111111
return
112112
}
113113

114+
val postProcessors = LanguagePromptProcessor.instance("DevIn").firstOrNull()
115+
if (postProcessors != null) {
116+
prompt = postProcessors.compile(chatCodingService.project, prompt)
117+
}
118+
114119
/// load prompt template
115120
addRequestPrompt(prompt)
116121

@@ -142,7 +147,8 @@ class ChatSketchView(val project: Project, val editor: Editor?, private val show
142147

143148
fun onStart() {
144149
initializePreAllocatedBlocks(project)
145-
progressBar.isIndeterminate = !showInput
150+
progressBar.isIndeterminate = true
151+
progressBar.isVisible = !showInput
146152
}
147153

148154
fun hiddenProgressBar() {
@@ -171,7 +177,6 @@ class ChatSketchView(val project: Project, val editor: Editor?, private val show
171177

172178
codeBlockViewer.editorFragment?.setCollapsed(true)
173179
codeBlockViewer.editorFragment!!.updateExpandCollapseLabel()
174-
codeBlockViewer.editorFragment!!.editor.backgroundColor = JBColor(0xF7FAFDF, 0x2d2f30)
175180

176181
val panel = panel {
177182
row {

core/src/main/kotlin/cc/unitmesh/devti/sketch/highlight/CodeHighlightSketch.kt

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,7 @@ import com.intellij.ui.components.JBPanel
2727
import com.intellij.util.concurrency.annotations.RequiresReadLock
2828
import com.intellij.util.ui.JBUI
2929
import cc.unitmesh.devti.sketch.LangSketch
30+
import com.intellij.util.ui.JBEmptyBorder
3031
import java.awt.BorderLayout
3132
import java.util.concurrent.atomic.AtomicBoolean
3233
import javax.swing.JComponent
@@ -52,16 +53,17 @@ class CodeHighlightSketch(val project: Project, val text: String, private var id
5253

5354
val editor = createCodeViewerEditor(project, text, ideaLanguage, this)
5455

55-
editor.component.border = JBUI.Borders.empty(10, 0)
56+
border = JBEmptyBorder(8)
57+
layout = BorderLayout(JBUI.scale(8), 0)
58+
background = JBColor(0xEAEEF7, 0x2d2f30)
59+
5660
editor.component.isOpaque = true
5761

5862
editorFragment = EditorFragment(editor, editorLineThreshold)
5963
add(editorFragment!!.getContent(), BorderLayout.CENTER)
6064

6165
if (ideaLanguage?.displayName != "Markdown" && ideaLanguage != PlainTextLanguage.INSTANCE) {
6266
setupActionBar(project, editor)
63-
} else {
64-
editor.backgroundColor = JBColor.PanelBackground
6567
}
6668
}
6769

core/src/main/kotlin/cc/unitmesh/devti/sketch/highlight/EditorFragment.kt

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,6 @@ import java.awt.event.MouseEvent
1515
import javax.swing.Box
1616
import javax.swing.JComponent
1717

18-
1918
class EditorPadding(private val editor: Editor, pad: Int) :
2019
Box.Filler(Dimension(pad, pad), Dimension(pad, pad), Dimension(pad, pad)) {
2120
init {

core/src/main/kotlin/cc/unitmesh/devti/sketch/patch/DiffLangSketch.kt

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -47,10 +47,7 @@ class DiffLangSketch(private val myProject: Project, private var patchContent: S
4747

4848
myHeaderPanel.add(header, BorderLayout.EAST)
4949
mainPanel.add(myHeaderPanel)
50-
mainPanel.border = JBUI.Borders.compound(
51-
JBUI.Borders.empty(0, 10),
52-
JBUI.Borders.customLine(JBColor.border(), 1, 1, 1, 1)
53-
)
50+
mainPanel.border = JBUI.Borders.compound(JBUI.Borders.empty(0, 10))
5451

5552
ApplicationManager.getApplication().invokeAndWait {
5653
if (filePatches.isEmpty()) {
@@ -114,7 +111,7 @@ class DiffLangSketch(private val myProject: Project, private var patchContent: S
114111
panel.add(rejectButton)
115112
panel.add(viewDiffButton)
116113

117-
panel.background = JBColor(0xF5F5F5, 0x333333)
114+
panel.background = JBColor(0xEAEEF7, 0x2d2f30)
118115

119116
return panel
120117
}

core/src/main/kotlin/cc/unitmesh/devti/sketch/patch/SingleFileDiffView.kt

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -83,8 +83,6 @@ class SingleFileDiffView(
8383
}
8484
}
8585
}
86-
}.apply {
87-
background = JBColor.PanelBackground
8886
}
8987

9088
val fileContainer = JPanel(BorderLayout(10, 10)).also {

0 commit comments

Comments
 (0)