User: rednesto Date: 06 Jan 24 17:30 Revision: 5d7d99b9b32e9eaa9bbeaa4882b17fdc5236dbc4 Summary: Fix minecraft-dev/mcdev-error-report#1767 TeamCity URL: http://ci.mcdev.io:80/viewModification.html?tab=vcsModificationFiles&modId=8957&personal=false Index: src/main/kotlin/insight/ColorLineMarkerProvider.kt =================================================================== --- src/main/kotlin/insight/ColorLineMarkerProvider.kt (revision a9ef43123a4e9442c5f4656410ec36e5f4b85e00) +++ src/main/kotlin/insight/ColorLineMarkerProvider.kt (revision 5d7d99b9b32e9eaa9bbeaa4882b17fdc5236dbc4) @@ -85,7 +85,7 @@ val editor = PsiEditorUtil.findEditor(psiElement) ?: return@handler - val picker = ColorPicker(map, editor.component) + val picker = ColorPicker(map, element.project, editor.component) val newColor = picker.showDialog() if (newColor != null && map[newColor] != color) { workElement.setColor(newColor) Index: src/main/kotlin/insight/ColorPicker.kt =================================================================== --- src/main/kotlin/insight/ColorPicker.kt (revision a9ef43123a4e9442c5f4656410ec36e5f4b85e00) +++ src/main/kotlin/insight/ColorPicker.kt (revision 5d7d99b9b32e9eaa9bbeaa4882b17fdc5236dbc4) @@ -21,6 +21,7 @@ package com.demonwav.mcdev.insight import com.demonwav.mcdev.asset.MCDevBundle +import com.intellij.openapi.project.Project import com.intellij.openapi.ui.DialogWrapper import com.intellij.util.ui.ColorIcon import com.intellij.util.ui.JBUI @@ -33,7 +34,7 @@ import javax.swing.JLabel import javax.swing.JPanel -class ColorPicker(private val colorMap: Map, parent: JComponent) { +class ColorPicker(private val colorMap: Map, project: Project, parent: JComponent) { private val panel = JPanel(GridBagLayout()) @@ -41,7 +42,7 @@ private val dialog: ColorPickerDialog init { - dialog = ColorPickerDialog(parent, panel) + dialog = ColorPickerDialog(project, parent, panel) } fun showDialog(): String? { @@ -86,8 +87,8 @@ } } - private class ColorPickerDialog(parent: JComponent, private val component: JComponent) : - DialogWrapper(parent, false) { + private class ColorPickerDialog(project: Project, parent: JComponent, private val component: JComponent) : + DialogWrapper(project, parent, false, IdeModalityType.MODELESS) { init { title = MCDevBundle("generate.color.choose_action") Index: src/main/kotlin/insight/generation/ui/EventGenerationDialog.kt =================================================================== --- src/main/kotlin/insight/generation/ui/EventGenerationDialog.kt (revision a9ef43123a4e9442c5f4656410ec36e5f4b85e00) +++ src/main/kotlin/insight/generation/ui/EventGenerationDialog.kt (revision 5d7d99b9b32e9eaa9bbeaa4882b17fdc5236dbc4) @@ -31,7 +31,7 @@ private val panel: EventGenerationPanel, className: String, defaultListenerName: String, -) : DialogWrapper(editor.component, false) { +) : DialogWrapper(editor.project, editor.component, false, IdeModalityType.PROJECT) { private val wizard: EventListenerWizard = EventListenerWizard(panel.panel, className, defaultListenerName)