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

Merge branch 'master' into master

Browse Source
This commit is contained in:
Equinox
2020-02-15 15:15:28 -08:00
committed by GitHub
parent d236fd9bd9 bc54b79098
commit 0a19663c33
4 changed files with 23 additions and 8 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))
// throw new NotSupportedException("ModToIdConverter can only convert mods into int values or vise versa!");
var mod = (ModItemInfo) values[0];
var theModList = (MtObservableList<ModItemInfo>) values[1];
return theModList.IndexOf(mod);
if (values[0] is ModItemInfo mod && values[1] is MtObservableList<ModItemInfo> modList)
{
return modList.IndexOf(mod);
}
else
{
return null;
}
}
/// <summary>

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

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

10
Torch/Collections/MtObservableList.cs
View File

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

2
Torch/TorchPluginBase.cs
View File

@@ -28,7 +28,7 @@ namespace Torch
}
public virtual void Update() { }
public PluginState State { get; }
public PluginState State { get; } = PluginState.Enabled;
public virtual void Dispose() { }
}