Merge pull request #195 from amazingalek/alek/compatibility-fix-fix

this works too
ow-mods · Jul 13, 2020 · 0179205 · 0179205
2 parents 19d19c6 + 20c2122
commit 0179205
Show file tree

Hide file tree

Showing 6 changed files with 11 additions and 11 deletions.
diff --git a/OWML.Common/Menus/IModMainMenu.cs b/OWML.Common/Menus/IModMainMenu.cs
@@ -2,9 +2,9 @@
 {
     public interface IModMainMenu : IModOWMenu
     {
-        IModTabbedMenu OptionsMenu { get; }
-        IModButton OptionsButton { get; }
-        IModButton QuitButton { get; }
+        new IModTabbedMenu OptionsMenu { get; }
+        new IModButton OptionsButton { get; }
+        new IModButton QuitButton { get; }
         IModButton ResumeExpeditionButton { get; }
         IModButton NewExpeditionButton { get; }
         IModButton ViewCreditsButton { get; }

diff --git a/OWML.Common/Menus/IModPauseMenu.cs b/OWML.Common/Menus/IModPauseMenu.cs
@@ -2,9 +2,9 @@
 {
     public interface IModPauseMenu : IModPopupMenu, IModOWMenu
     {
-        IModTabbedMenu OptionsMenu { get; }
-        IModButton OptionsButton { get; }
-        IModButton QuitButton { get; }
+        new IModTabbedMenu OptionsMenu { get; }
+        new IModButton OptionsButton { get; }
+        new IModButton QuitButton { get; }
         IModButton ResumeButton { get; }
 
         void Initialize(SettingsManager settingsManager);

diff --git a/OWML.ModHelper.Menus/ModButton.cs → OWML.ModHelper.Menus/ModButtonBase.cs b/OWML.ModHelper.Menus/ModButton.cs → OWML.ModHelper.Menus/ModButtonBase.cs
@@ -6,7 +6,7 @@
 
 namespace OWML.ModHelper.Menus
 {
-    public abstract class ModButton : IModButtonBase
+    public abstract class ModButtonBase : IModButtonBase
     {
         public event Action OnClick;
 
@@ -27,7 +27,7 @@ public int Index
 
         private readonly UIStyleApplier _uIStyleApplier;
 
-        protected ModButton(Button button, IModMenu menu)
+        protected ModButtonBase(Button button, IModMenu menu)
         {
             _uIStyleApplier = button.GetComponent<UIStyleApplier>();
             Button = button;

diff --git a/OWML.ModHelper.Menus/ModLayoutButton.cs b/OWML.ModHelper.Menus/ModLayoutButton.cs
@@ -4,7 +4,7 @@
 
 namespace OWML.ModHelper.Menus
 {
-    public class ModLayoutButton : ModButton, IModLayoutButton
+    public class ModLayoutButton : ModButtonBase, IModLayoutButton
     {
         public IModLayoutManager Layout { get; }
 

diff --git a/OWML.ModHelper.Menus/ModTitleButton.cs b/OWML.ModHelper.Menus/ModTitleButton.cs
@@ -4,7 +4,7 @@
 
 namespace OWML.ModHelper.Menus
 {
-    public class ModTitleButton : ModButton, IModButton
+    public class ModTitleButton : ModButtonBase, IModButton
     {
         private readonly Text _text;
         public virtual string Title

diff --git a/OWML.ModHelper.Menus/OWML.ModHelper.Menus.csproj b/OWML.ModHelper.Menus/OWML.ModHelper.Menus.csproj
@@ -85,7 +85,7 @@
     <Compile Include="ModInputCombinationMenu.cs" />
     <Compile Include="ModInputCombinationPopup.cs" />
     <Compile Include="ModLayoutButton.cs" />
-    <Compile Include="ModButton.cs" />
+    <Compile Include="ModButtonBase.cs" />
     <Compile Include="ModConfigMenuBase.cs" />
     <Compile Include="ModTitleButton.cs" />
     <Compile Include="ModConfigMenu.cs" />