fix: add custom event handler if not default

This commit is contained in:
2024-04-15 09:00:39 +02:00
parent 8f4294783b
commit 3f5f9ddb87
3 changed files with 26 additions and 3 deletions

View File

@@ -65,7 +65,7 @@ namespace Pilz.Plugins.Advanced
/// You usually don't set customClickHandler if you set this parameter to <see cref="true"/>.</param>
/// <param name="customClickHandler">Adds a custom click handler. If addDefaultHandler is true, it will only work on <see cref="PluginFeature"/>s.<br/>
/// You usually don't set addDefaultHandler to true if you set this parameter to something not null.</param>
public static void InsertItemsTo(this IEnumerable<PluginFeature> features, RadItemOwnerCollection itemsCollection, bool addDefaultHandler = false, EventHandler? customClickHandler = null, FeatureInsertMode insertMode = FeatureInsertMode.Default, int? customDefault = null, int? customTop = null, int? customBottom = null)
public static void InsertItemsTo(this IEnumerable<PluginFeature> features, RadItemOwnerCollection itemsCollection, bool addDefaultHandler = false, EventHandler? customClickHandler = null, FeatureInsertMode insertMode = FeatureInsertMode.Default, int? customDefault = null, int? customTop = null, int? customBottom = null, FeatureInsertPosition insertSplitter = FeatureInsertPosition.None)
{
var insertDefault = customDefault ?? (insertMode.HasFlag(FeatureInsertMode.DefaultStart) ? 0 : itemsCollection.Count);
var insertTop = customTop ?? (insertMode.HasFlag(FeatureInsertMode.InsertTop) || insertMode.HasFlag(FeatureInsertMode.DefaultStart) ? 0 : insertDefault);
@@ -82,21 +82,27 @@ namespace Pilz.Plugins.Advanced
else
item = feature.GetAsItem(null);
if (!addDefaultHandler && customClickHandler != null)
item.Click += customClickHandler;
switch (feature.Prioritization)
{
case FeaturePrioritization.High:
if (insertDefault >= insertTop) insertDefault++;
if (insertBottom >= insertTop) insertBottom++;
// ...
itemsCollection.Insert(insertTop++, item);
break;
case FeaturePrioritization.Default:
if (insertBottom >= insertDefault) insertBottom++;
if (insertTop >= insertDefault) insertTop++;
// ...
itemsCollection.Insert(insertDefault++, item);
break;
case FeaturePrioritization.Low:
if (insertTop >= insertBottom) insertTop++;
if (insertDefault >= insertBottom) insertDefault++;
// ...
itemsCollection.Insert(insertBottom++, item);
break;
}

View File

@@ -0,0 +1,17 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
namespace Pilz.Plugins.Advanced
{
[Flags]
public enum FeatureInsertPosition
{
None = 0,
Default = 1,
Top = 2,
Bottom = 3,
}
}

View File

@@ -28,7 +28,7 @@ namespace Pilz.Plugins.Advanced
/// </summary>
public static PluginFeatureController Instance { get; private set; } = new();
private readonly List<PluginFeature> features = new();
private readonly HashSet<PluginFeature> features = new();
/// <summary>
/// A wrapper of all registred <see cref="PluginFeature"/> instances.
@@ -78,7 +78,7 @@ namespace Pilz.Plugins.Advanced
public virtual IEnumerable<PluginFeature> GetAll()
{
return controller.features.AsReadOnly();
return controller.features.ToArray();
}
public virtual IEnumerable<PluginFeature> Get(string featureType)