@@ -15,22 +15,23 @@ import com.intellij.openapi.actionSystem.ActionManager
15
15
import com.intellij.openapi.actionSystem.ActionPlaces
16
16
import com.intellij.openapi.actionSystem.ActionToolbar
17
17
import com.intellij.openapi.actionSystem.impl.ActionToolbarImpl
18
+ import com.intellij.openapi.application.invokeLater
18
19
import com.intellij.openapi.fileEditor.FileEditor
19
20
import com.intellij.openapi.fileEditor.FileEditorManager
20
21
import com.intellij.openapi.project.Project
21
- import com.intellij.ui.AppUIUtil
22
22
import com.intellij.util.ui.JBEmptyBorder
23
23
24
24
class EditorToolbarFactory {
25
25
companion object {
26
26
fun create (actionId : String , editor : FileEditor , project : Project ): ActionToolbar {
27
27
val actionManager = ActionManager .getInstance()
28
28
val group = actionManager.getAction(actionId) as ActionGroup
29
- val toolbar =
30
- actionManager.createActionToolbar(ActionPlaces .EDITOR_TOOLBAR , group, true ) as ActionToolbarImpl
29
+ val toolbar = actionManager
30
+ .createActionToolbar(ActionPlaces .EDITOR_TOOLBAR , group, true ) as ActionToolbarImpl
31
+ toolbar.targetComponent = editor.component
31
32
toolbar.isOpaque = false
32
33
toolbar.border = JBEmptyBorder (0 , 2 , 0 , 2 )
33
- AppUIUtil .invokeOnEdt {
34
+ invokeLater {
34
35
FileEditorManager .getInstance(project).addTopComponent(editor, toolbar)
35
36
}
36
37
return toolbar
0 commit comments