SingleAction: change type of Arguments to array

d2phap · Aug 12, 2023 · a0698cd · a0698cd
1 parent 6047f43
commit a0698cd
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 8 deletions.
diff --git a/v9/Components/ImageGlass.Base/Actions/SingleAction.cs b/v9/Components/ImageGlass.Base/Actions/SingleAction.cs
@@ -48,7 +48,7 @@ public class SingleAction
     /// <summary>
     /// Arguments to pass to the <see cref="Executable"/>.
     /// </summary>
-    public object Arguments { get; set; } = string.Empty;
+    public object?[] Arguments { get; set; } = Array.Empty<object?>();
 
 
     /// <summary>
@@ -66,10 +66,10 @@ public SingleAction() { }
     /// <summary>
     /// Initialize the <see cref="SingleAction"/> instance.
     /// </summary>
-    public SingleAction(string executable = "", string arguments = "", SingleAction? nextAction = null)
+    public SingleAction(string executable = "", object?[]? arguments = null, SingleAction? nextAction = null)
     {
         Executable = executable.Trim();
-        Arguments = arguments.Trim();
+        Arguments = arguments ?? Array.Empty<object>();
         NextAction = nextAction;
     }
 

diff --git a/v9/ImageGlass/FrmMain/FrmMain.Configs.cs b/v9/ImageGlass/FrmMain/FrmMain.Configs.cs
@@ -623,7 +623,7 @@ private void UpdateToolbarItemsState(bool performLayout = true)
     {
         Toolbar.SuspendLayout();
 
-        // Toolbar itoms
+        // Toolbar buttons
         foreach (var item in Toolbar.Items)
         {
             if (item.GetType() == typeof(ToolStripButton))
@@ -657,7 +657,7 @@ private void UpdateToolbarItemsState(bool performLayout = true)
                 // Example: OnClick = new("IG_SetZoomMode", ZoomMode.AutoZoom.ToString())
                 else if (configProp.PropertyType.IsEnum)
                 {
-                    tItem.Checked = tagModel.OnClick.Arguments.Equals(propValue.ToString());
+                    tItem.Checked = tagModel.OnClick.Arguments.FirstOrDefault().Equals(propValue.ToString());
                 }
                 // Executable is IGMethod
                 // Example: OnClick = new("IG_ToggleToolbar", false)

diff --git a/v9/ImageGlass/FrmMain/FrmMain.IGMethods.cs b/v9/ImageGlass/FrmMain/FrmMain.IGMethods.cs
@@ -746,8 +746,6 @@ public bool IG_ToggleCheckerboard(bool? visible = null)
     /// <summary>
     /// Toggles form top most
     /// </summary>
-    /// <param name="enableTopMost"></param>
-    /// <returns></returns>
     public bool IG_ToggleTopMost(bool? enableTopMost = null, bool showInAppMessage = true)
     {
         enableTopMost ??= !Config.EnableWindowTopMost;
@@ -2448,7 +2446,7 @@ public bool IG_ToggleFullScreen(bool? enable = null, bool showInAppMessage = tru
             // update toolbar items state
             UpdateToolbarItemsState();
         }
-        
+
 
         if (showInAppMessage)
         {