dearwolf/sourcegit
1
0
Fork 0
mirror of https://github.com/sourcegit-scm/sourcegit synced 2025-05-24 13:45:00 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Merge pull request !19 from Jai/fix/copy-content-order

Browse source 
* optimix<Diff>: performance optimization
* fix<DiffViewer>: incorrect order when copying file contents
This commit is contained in:
Jai 2021-08-11 11:16:00 +00:00 • committed by leo
parent eb2c07b2b6
commit 663f3237c0
3 changed files with 17 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

15
src/Views/Widgets/DiffViewer.xaml.cs
View file

@ -1,6 +1,7 @@
using System;
using System.Collections.Generic;
using System.Globalization;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
using System.Windows;
@ -346,13 +347,11 @@ namespace SourceGit.Views.Widgets {
grid.ContextMenuOpening += OnTextDiffContextMenuOpening;
grid.PreviewMouseWheel += OnTextDiffPreviewMouseWheel;
grid.CommandBindings.Add(new CommandBinding(ApplicationCommands.Copy, (o, e) => {
var items = (o as DataGrid).SelectedItems;
if (items.Count == 0) return;
var items = (o as DataGrid)?.SelectedItems.OfType<Models.TextChanges.Line>().OrderBy(i => i.Index).ToList();
if (items == null || items.Count == 0) return;
var builder = new StringBuilder();
foreach (var item in items) {
var block = item as Models.TextChanges.Line;
if (block == null) continue;
foreach (var block in items) {
if (!block.IsContent) continue;
builder.Append(block.Content);
@ -466,13 +465,11 @@ namespace SourceGit.Views.Widgets {
copy.Header = App.Text("Diff.Copy");
copy.Icon = copyIcon;
copy.Click += (o, ev) => {
var items = grid.SelectedItems;
var items = grid.SelectedItems.OfType<Models.TextChanges.Line>().OrderBy(i => i.Index).ToList();
if (items.Count == 0) return;
var builder = new StringBuilder();
foreach (var item in items) {
var block = item as Models.TextChanges.Line;
if (block == null) continue;
foreach (var block in items) {
if (!block.IsContent) continue;
builder.Append(block.Content);