MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-03-22 06:50:54 +07:00
Code Issues Packages Projects Releases Wiki Activity

IJPL-161959 IJPL-161046 git: fix wrong 'Show Diff/Source on Double Click' flag being used in 'Staging Area'

Browse Source 
GitOrigin-RevId: b612c821ac8d58d3ed4f7402088cbea33d4adad5
This commit is contained in:
Aleksey Pivovarov
2024-09-09 18:15:26 +02:00
committed by intellij-monorepo-bot
parent dda52aac34
commit 7e8c067d2c
1 changed files with 18 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
plugins/git4idea/src/git4idea/index/ui/GitStageEditorDiffPreview.kt
View File

@@ -6,6 +6,7 @@ import com.intellij.openapi.actionSystem.AnActionEvent
import com.intellij.openapi.vcs.VcsApplicationSettings
import com.intellij.openapi.vcs.VcsBundle
import com.intellij.openapi.vcs.changes.ChangeViewDiffRequestProcessor
import com.intellij.openapi.vcs.changes.ui.ChangesViewContentManager.Companion.isCommitToolWindowShown
import com.intellij.openapi.vcs.changes.ui.TreeHandlerEditorDiffPreview
import git4idea.index.GitStageTracker
import git4idea.index.actions.updateStageDiffAvailability
@@ -38,6 +39,21 @@ class GitStageEditorDiffPreview(
activate()
}
override fun isPreviewOnDoubleClick(): Boolean = VcsApplicationSettings.getInstance().SHOW_EDITOR_PREVIEW_ON_DOUBLE_CLICK
override fun isPreviewOnEnter(): Boolean = VcsApplicationSettings.getInstance().SHOW_EDITOR_PREVIEW_ON_DOUBLE_CLICK
override fun isPreviewOnDoubleClick(): Boolean {
if (isCommitToolWindowShown(project)) {
return VcsApplicationSettings.getInstance().SHOW_EDITOR_PREVIEW_ON_DOUBLE_CLICK
}
else {
return VcsApplicationSettings.getInstance().SHOW_DIFF_ON_DOUBLE_CLICK
}
}
override fun isPreviewOnEnter(): Boolean {
if (isCommitToolWindowShown(project)) {
return VcsApplicationSettings.getInstance().SHOW_EDITOR_PREVIEW_ON_DOUBLE_CLICK
}
else {
return VcsApplicationSettings.getInstance().SHOW_DIFF_ON_DOUBLE_CLICK
}
}
}