wip: wip

pudding-fox · Jan 25, 2024 · ce3aa66 · ce3aa66
1 parent 5fc0253
commit ce3aa66
Show file tree

Hide file tree

Showing 5 changed files with 17 additions and 9 deletions.
diff --git a/FoxTunes.UI.Windows.Layout/UIComponentContainer.cs b/FoxTunes.UI.Windows.Layout/UIComponentContainer.cs
@@ -311,10 +311,6 @@ public virtual IEnumerable<IInvocationComponent> Invocations
                     }
                     foreach (var alternative in LayoutManager.Instance.GetComponents(UIComponentRole.Container))
                     {
-                        if (string.Equals(this.Configuration.Component.Id, alternative.Id, StringComparison.OrdinalIgnoreCase))
-                        {
-                            continue;
-                        }
                         yield return new InvocationComponent(InvocationComponent.CATEGORY_GLOBAL, WRAP, alternative.Name, path: Strings.UIComponentContainer_Wrap, attributes: attributes);
                         attributes = InvocationComponent.ATTRIBUTE_NONE;
                     }

diff --git a/FoxTunes.UI.Windows.MiniPlayer/Behaviours/MiniPlayerBehaviourConfiguration.cs b/FoxTunes.UI.Windows.MiniPlayer/Behaviours/MiniPlayerBehaviourConfiguration.cs
@@ -7,8 +7,6 @@ public static class MiniPlayerBehaviourConfiguration
     {
         public const string SECTION = "F3E58830-97C0-4BA2-9E07-3EC27E3D4418";
 
-        public const string NOW_PLAYING_SCRIPT_ELEMENT = "BBBB78F3-B32F-4A8C-B566-9A8B39A896C7";
-
         public const string TOPMOST_ELEMENT = "CCCC7F71-A506-48DF-9420-E6926465FFDC";
 
         public const string SHOW_ARTWORK_ELEMENT = "FFFFB3A4-E59D-46CE-B80A-86EAB9427108";

diff --git a/FoxTunes.UI.Windows.MiniPlayer/NowPlaying.xaml b/FoxTunes.UI.Windows.MiniPlayer/NowPlaying.xaml
@@ -1,4 +1,4 @@
-<Windows:UIComponentBase x:Class="FoxTunes.NowPlaying"
+<Windows:ConfigurableUIComponentBase x:Class="FoxTunes.NowPlaying"
              xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
              xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" 
@@ -26,4 +26,4 @@
             </Style>
         </LocalWindows:Marquee.Style>
     </LocalWindows:Marquee>
-</Windows:UIComponentBase>
+</Windows:ConfigurableUIComponentBase>
diff --git a/FoxTunes.UI.Windows.MiniPlayer/NowPlaying.xaml.cs b/FoxTunes.UI.Windows.MiniPlayer/NowPlaying.xaml.cs
@@ -6,7 +6,7 @@ namespace FoxTunes
     /// Interaction logic for NowPlaying.xaml
     /// </summary>
     [UIComponent("CFF16494-CB86-4483-99C7-07E496FE894A", role: UIComponentRole.Info)]
-    public partial class NowPlaying : UIComponentBase
+    public partial class NowPlaying : ConfigurableUIComponentBase
     {
         public NowPlaying()
         {

diff --git a/FoxTunes.UI.Windows.MiniPlayer/NowPlayingConfiguration.cs b/FoxTunes.UI.Windows.MiniPlayer/NowPlayingConfiguration.cs
@@ -0,0 +1,14 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+
+namespace FoxTunes
+{
+    public static class NowPlayingConfiguration
+    {
+        public const string SECTION = "A9F63A1C-16F8-4F68-8E49-3C4C62172FFA";
+
+        public const string NOW_PLAYING_SCRIPT_ELEMENT = "BBBB78F3-B32F-4A8C-B566-9A8B39A896C7";
+    }
+}