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

git-branches-dashboard: support showing log diff preview in editor

Browse Source 
GitOrigin-RevId: b4b95af3cdcac76adef4c6111ab093e673fbf0c6
This commit is contained in:
Dmitry Zhuravlev
2020-02-21 17:31:28 +00:00
committed by intellij-monorepo-bot
parent 5cf03f36fe
commit b5236c05d5
1 changed files with 15 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
plugins/git4idea/src/git4idea/ui/branch/dashboard/BranchesDashboardUi.kt
+15 -8
View File
@@ -38,10 +38,8 @@ import com.intellij.vcs.log.ui.VcsLogColorManagerImpl
import com.intellij.vcs.log.ui.VcsLogInternalDataKeys
import com.intellij.vcs.log.ui.VcsLogUiImpl
import com.intellij.vcs.log.ui.filter.VcsLogFilterUiEx
import com.intellij.vcs.log.ui.frame.FrameDiffPreview
import com.intellij.vcs.log.ui.frame.MainFrame
import com.intellij.vcs.log.ui.frame.ProgressStripe
import com.intellij.vcs.log.ui.frame.VcsLogChangeProcessor
import com.intellij.vcs.log.ui.frame.*
import com.intellij.vcs.log.util.VcsLogUiUtil.isDiffPreviewInEditor
import com.intellij.vcs.log.visible.VisiblePackRefresher
import com.intellij.vcs.log.visible.VisiblePackRefresherImpl
import com.intellij.vcs.log.visible.filters.VcsLogFilterObject
@@ -95,8 +93,14 @@ internal class BranchesDashboardUi(project: Project, private val logUi: Branches
uiController.registerLogUiPropertiesListener(logUi.properties)
branchesSearchField.setVerticalSizeReferent(logUi.toolbar)
branchViewSplitter.secondComponent = logUi.mainFrame
val diffPreview = logUi.createDiffPreview()
mainPanel.add(DiffPreviewSplitter(diffPreview, logUi.properties, branchesTreeWithLogPanel).mainComponent)
val isDiffPreviewInEditor = isDiffPreviewInEditor()
val diffPreview = logUi.createDiffPreview(isDiffPreviewInEditor)
if (isDiffPreviewInEditor) {
mainPanel.add(branchesTreeWithLogPanel)
}
else {
mainPanel.add(DiffPreviewSplitter(diffPreview, logUi.properties, branchesTreeWithLogPanel).mainComponent)
}
tree.component.addTreeSelectionListener(treeSelectionListener)
}
@@ -259,12 +263,15 @@ internal class BranchesVcsLogUi(id: String, logData: VcsLogData, colorManager: V
.apply {
isFocusCycleRoot = false
focusTraversalPolicy = null //new focus traversal policy will be configured include branches tree
if (isDiffPreviewInEditor()) {
VcsLogEditorDiffPreview(myProject, uiProperties, this)
}
}
override fun getMainComponent() = branchesUi.getMainComponent()
fun createDiffPreview(): VcsLogChangeProcessor {
return mainFrame.createDiffPreview(false, mainFrame.changesBrowser)
fun createDiffPreview(isInEditor: Boolean): VcsLogChangeProcessor {
return mainFrame.createDiffPreview(isInEditor, mainFrame.changesBrowser)
}
}