Add 'ShowDiffDialogOnDrop' option to control diff dialog display on file drop

akiyosi · akiyosi · commit 443a6eda0004 · 2024-07-25T23:48:01.000+09:00
diff --git a/editor/config.go b/editor/config.go
@@ -88,6 +88,7 @@ type editorConfig struct {
 	HideMouseWhenTyping                     bool
 	IgnoreSaveConfirmationWithCloseButton   bool
 	UseWSL                                  bool
+	ShowDiffDialogOnDrop                    bool
 }
 
 type cursorConfig struct {
diff --git a/editor/window.go b/editor/window.go
@@ -3482,7 +3482,7 @@ func (w *Window) dropEvent(e *gui.QDropEvent) {
 						false,
 					)
 				} else {
-					if bufName != "" {
+					if editor.config.Editor.ShowDiffDialogOnDrop && bufName != "" {
 						w.s.howToOpen(filepath)
 					} else {
 						fileOpenInBuf(filepath)

Original file line number	Diff line number	Diff line change
`@@ -88,6 +88,7 @@ type editorConfig struct {`
`88`	`88`	`HideMouseWhenTyping bool`
`89`	`89`	`IgnoreSaveConfirmationWithCloseButton bool`
`90`	`90`	`UseWSL bool`
	`91`	`+ ShowDiffDialogOnDrop bool`
`91`	`92`	`}`
`92`	`93`
`93`	`94`	`type cursorConfig struct {`
Original file line number	Diff line number	Diff line change
`@@ -3482,7 +3482,7 @@ func (w Window) dropEvent(e gui.QDropEvent) {`
`3482`	`3482`	`false,`
`3483`	`3483`	`)`
`3484`	`3484`	`} else {`
`3485`		`- if bufName != "" {`
	`3485`	`+ if editor.config.Editor.ShowDiffDialogOnDrop && bufName != "" {`
`3486`	`3486`	`w.s.howToOpen(filepath)`
`3487`	`3487`	`} else {`
`3488`	`3488`	`fileOpenInBuf(filepath)`