MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-09-27 10:03:11 +07:00
Code Issues Packages Projects Releases Wiki Activity

Focus table after closing merge dialog (IDEA-CR-32596)

Browse Source
This commit is contained in:
Dmitry Jemerov
2018-05-29 18:46:45 +02:00
parent 2689288665
commit 444e97da64
1 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
platform/vcs-impl/src/com/intellij/openapi/vcs/merge/MultipleFileMergeDialog2.kt
+3 -1
View File
@@ -26,6 +26,7 @@ import com.intellij.openapi.vcs.VcsException
import com.intellij.openapi.vcs.changes.VcsDirtyScopeManager
import com.intellij.openapi.vfs.VfsUtil
import com.intellij.openapi.vfs.VirtualFile
import com.intellij.openapi.wm.IdeFocusManager
import com.intellij.ui.ColoredTreeCellRenderer
import com.intellij.ui.DoubleClickListener
import com.intellij.ui.SimpleTextAttributes
@@ -101,7 +102,7 @@ open class MultipleFileMergeDialog2(
}
}
SpeedSearchUtil.applySpeedSearchHighlighting(this@MultipleFileMergeDialog2.table, this, true, selected)
SpeedSearchUtil.applySpeedSearchHighlighting(table, this, true, selected)
}
override fun calcFocusedState() = table.hasFocus()
@@ -455,6 +456,7 @@ open class MultipleFileMergeDialog2(
DiffManager.getInstance().showMerge(project, request)
}
updateModelFromFiles()
IdeFocusManager.getInstance(project).requestFocus(table, false)
}
private fun getSessionResolution(result: MergeResult): MergeSession.Resolution = when (result) {