Skip to content

Commit 111098b

Browse files
committed
feat: refactor inlay
1 parent c277e19 commit 111098b

File tree

4 files changed

+35
-32
lines changed

4 files changed

+35
-32
lines changed

src/main/kotlin/com/github/xepozz/call/base/inlay/ExecutionInlayProvider.kt

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -199,7 +199,6 @@ class ExecutionInlayProvider : InlayHintsProvider<NoSettings> {
199199
var current = sessions[key]
200200
val wrapper = feature.createWrapper()
201201

202-
203202
if (current?.container == null) {
204203
try {
205204
val container = createResultContainer()

src/main/kotlin/com/github/xepozz/call/base/inlay/ui/createResultContainer.kt

Lines changed: 10 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -4,38 +4,20 @@ import com.intellij.ui.JBColor
44
import com.intellij.util.ui.JBUI
55
import java.awt.BorderLayout
66
import java.awt.Dimension
7-
import java.awt.FlowLayout
87
import javax.swing.BorderFactory
98
import javax.swing.JPanel
109
import javax.swing.OverlayLayout
1110

1211
fun createResultContainer(): JPanel {
13-
val toolbar = createToolbar()
12+
val container = JPanel(BorderLayout()).apply {
13+
layout = OverlayLayout(this)
14+
border = BorderFactory.createCompoundBorder(
15+
BorderFactory.createLineBorder(JBColor.border(), 1),
16+
JBUI.Borders.empty(4)
17+
)
18+
background = JBColor.background()
19+
preferredSize = Dimension(700, 250)
20+
}
1421

15-
val container = JPanel(BorderLayout()).apply {
16-
layout = OverlayLayout(this)
17-
border = BorderFactory.createCompoundBorder(
18-
BorderFactory.createLineBorder(JBColor.border(), 1),
19-
JBUI.Borders.empty(4)
20-
)
21-
background = JBColor.background()
22-
preferredSize = Dimension(700, 250)
23-
}
24-
25-
val toolbarWrapper = JPanel(FlowLayout(FlowLayout.RIGHT, 5, 5)).apply {
26-
isOpaque = false
27-
alignmentX = 1.0f
28-
alignmentY = 0.0f
29-
add(toolbar.component)
30-
toolbar.targetComponent = this
31-
}
32-
val contentPanel = JPanel(BorderLayout()).apply {
33-
isOpaque = false
34-
alignmentX = 1f
35-
alignmentY = 1f
36-
}
37-
container.add(toolbarWrapper)
38-
container.add(contentPanel)
39-
40-
return container
22+
return container
4123
}

src/main/kotlin/com/github/xepozz/call/feature/http/HttpWrapperPanel.kt

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,9 +16,10 @@ class HttpWrapperPanel(project: Project) : Wrapper {
1616
val console: ConsoleView = builder.console
1717

1818
override val component: JComponent = JBTabbedPane(JTabbedPane.TOP).apply {
19-
addTab("Body", bodyConsole.component)
20-
addTab("Headers", headersConsole.component)
2119
addTab("Raw", console.component)
20+
addTab("Headers", headersConsole.component)
21+
addTab("Body", bodyConsole.component)
22+
// addTab("Preview", bodyConsole.component)
2223
}
2324

2425
override fun dispose() {

src/main/kotlin/com/github/xepozz/call/feature/shell/ConsoleWrapperPanel.kt

Lines changed: 22 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,36 @@
11
package com.github.xepozz.call.feature.shell
22

33
import com.github.xepozz.call.base.api.Wrapper
4+
import com.github.xepozz.call.base.inlay.ui.createToolbar
45
import com.intellij.execution.filters.TextConsoleBuilderFactory
56
import com.intellij.execution.ui.ConsoleView
67
import com.intellij.openapi.project.Project
8+
import java.awt.BorderLayout
9+
import java.awt.FlowLayout
710
import javax.swing.JComponent
11+
import javax.swing.JPanel
12+
import javax.swing.OverlayLayout
813

914
class ConsoleWrapperPanel(project: Project) : Wrapper {
1015
private val builder = TextConsoleBuilderFactory.getInstance().createBuilder(project)
1116
val console: ConsoleView = builder.console
12-
override val component: JComponent = console.component
17+
18+
19+
val toolbar = createToolbar()
20+
val toolbarWrapper = JPanel(FlowLayout(FlowLayout.RIGHT, 5, 5)).apply {
21+
isOpaque = false
22+
alignmentX = 1.0f
23+
alignmentY = 0.0f
24+
add(toolbar.component)
25+
toolbar.targetComponent = this
26+
}
27+
28+
override val component: JComponent = JPanel(BorderLayout()).apply {
29+
layout = OverlayLayout(this)
30+
31+
add(toolbarWrapper)
32+
add(console.component)
33+
}
1334

1435
override fun dispose() {
1536
console.dispose()

0 commit comments

Comments
 (0)