Skip to content

Commit 00e043e

Browse files
committed
chore: use ColorChooserService
1 parent 4078eee commit 00e043e

File tree

1 file changed

+5
-3
lines changed

1 file changed

+5
-3
lines changed

src/main/java/cc/duduhuo/git/conflict/setting/ColorSettingsPanelImpl.kt

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,15 +9,14 @@ import cc.duduhuo.git.conflict.action.HighlightConflictAction
99
import cc.duduhuo.git.conflict.model.MarkColor
1010
import cc.duduhuo.git.conflict.model.PersistentMarkColor
1111
import cc.duduhuo.git.conflict.tool.ext.formatHexA
12-
import com.intellij.ui.ColorChooser
12+
import com.intellij.ui.ColorChooserService
1313
import java.awt.Color
1414
import java.awt.event.ActionEvent
1515
import java.awt.event.ItemEvent
1616
import java.awt.event.MouseEvent
1717
import java.awt.event.MouseListener
1818
import javax.swing.JComponent
1919
import javax.swing.JOptionPane
20-
import kotlin.collections.LinkedHashMap
2120

2221
/**
2322
* =======================================================
@@ -223,7 +222,10 @@ class ColorSettingsPanelImpl : ColorSettingsPanel() {
223222

224223
else -> null
225224
}
226-
val chooseColor = ColorChooser.chooseColor(mainPanel, "Choose a Color", initialColor, true)
225+
val chooseColor = ColorChooserService.getInstance().showDialog(
226+
null, mainPanel, "Choose a Color", initialColor, true,
227+
emptyList(), false
228+
)
227229
if (chooseColor != null) {
228230
when (fieldIndex) {
229231
CURRENT_CONTENT -> {

0 commit comments

Comments
 (0)