PvE/Torch
3
0
Fork 0
Code Issues 1 Pull Requests Actions Releases 21 Wiki Activity

Fixed #364 (#365)

Browse Source 
* Added Move Function

* Fixed #364

* Quick fix as the issue still sort of persisted.

* Update ModToIdConverter.cs

* Fixed the logic inverse.
This commit is contained in:
Neko Boi Nick
2020-02-15 12:56:51 -08:00
committed by GitHub
parent 5035fa39b7
commit bc54b79098
3 changed files with 22 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
Torch.Server/Views/Converters/ModToIdConverter.cs
View File

@@ -32,9 +32,14 @@ namespace Torch.Server.Views.Converters
{ {
//if (targetType != typeof(int)) //if (targetType != typeof(int))
// throw new NotSupportedException("ModToIdConverter can only convert mods into int values or vise versa!"); // throw new NotSupportedException("ModToIdConverter can only convert mods into int values or vise versa!");
var mod = (ModItemInfo) values[0]; if (values[0] is ModItemInfo mod && values[1] is MtObservableList<ModItemInfo> modList)
var theModList = (MtObservableList<ModItemInfo>) values[1]; {
return theModList.IndexOf(mod); return modList.IndexOf(mod);
}
else
{
return null;
}
} }
/// <summary> /// <summary>

6
Torch.Server/Views/ModListControl.xaml.cs
View File

@@ -205,9 +205,9 @@ namespace Torch.Server.Views
{ {
_hasOrderChanged = true; _hasOrderChanged = true;
var modList = (MtObservableList<ModItemInfo>)DataContext; var modList = (MtObservableList<ModItemInfo>)DataContext;
//modList.Move(modList.IndexOf(_draggedMod), modList.IndexOf(targetMod)); modList.Move(modList.IndexOf(targetMod), _draggedMod);
modList.RemoveAt(modList.IndexOf(_draggedMod)); //modList.RemoveAt(modList.IndexOf(_draggedMod));
modList.Insert(modList.IndexOf(targetMod), _draggedMod); //modList.Insert(modList.IndexOf(targetMod), _draggedMod);
ModList.Items.Refresh(); ModList.Items.Refresh();
ModList.SelectedItem = _draggedMod; ModList.SelectedItem = _draggedMod;
} }

10
Torch/Collections/MtObservableList.cs
View File

@@ -189,5 +189,15 @@ namespace Torch.Collections
/// <inheritdoc/> /// <inheritdoc/>
bool IList.IsFixedSize => false; bool IList.IsFixedSize => false;
/// <inheritdoc/>
public void Move(int newIndex, object value)
{
if (value is T t)
{
base.Remove(t);
}
Insert(newIndex, (T)value);
}
} }
} }