diff --git a/RecrownedAthenaeum/UI/Modular/Modules/Interactive/Button.cs b/RecrownedAthenaeum/UI/Modular/Modules/Interactive/Button.cs index 5a1ffcc..284421f 100644 --- a/RecrownedAthenaeum/UI/Modular/Modules/Interactive/Button.cs +++ b/RecrownedAthenaeum/UI/Modular/Modules/Interactive/Button.cs @@ -3,6 +3,7 @@ using Microsoft.Xna.Framework.Input; using RecrownedAthenaeum.SpecialTypes; using RecrownedAthenaeum.Input; using RecrownedAthenaeum.UI.SkinSystem.Definitions; +using RecrownedAthenaeum.UI.SkinSystem; namespace RecrownedAthenaeum.UI.Modular.Modules.Interactive { @@ -54,7 +55,7 @@ namespace RecrownedAthenaeum.UI.Modular.Modules.Interactive /// /// The skin containing the information of the textures and design to follow. /// The name of the definition in the skin. Can be null to select the default. - public Button(SkinSystem.Skin skin, string definitionName = null) + public Button(ISkin skin, string definitionName = null) { skinDefinition = skin.ObtainDefinition(definitionName, GetType()); downTexture = skin.GetTextureAtlasRegion(skinDefinition.downRegion); diff --git a/RecrownedAthenaeum/UI/Modular/Modules/Interactive/TextButton.cs b/RecrownedAthenaeum/UI/Modular/Modules/Interactive/TextButton.cs index e4d91f7..b7d2e04 100644 --- a/RecrownedAthenaeum/UI/Modular/Modules/Interactive/TextButton.cs +++ b/RecrownedAthenaeum/UI/Modular/Modules/Interactive/TextButton.cs @@ -1,6 +1,7 @@ using Microsoft.Xna.Framework; using Microsoft.Xna.Framework.Graphics; using RecrownedAthenaeum.SpecialTypes; +using RecrownedAthenaeum.UI.SkinSystem; using RecrownedAthenaeum.UI.SkinSystem.Definitions; namespace RecrownedAthenaeum.UI.Modular.Modules.Interactive @@ -42,7 +43,7 @@ namespace RecrownedAthenaeum.UI.Modular.Modules.Interactive /// The font to be used. /// The skin to use. /// Name of the definition for this type in the skin given. - public TextButton(string text, SpriteFont font, SkinSystem.Skin skin, string definitionName = null) : base(skin, definitionName) + public TextButton(string text, SpriteFont font, ISkin skin, string definitionName = null) : base(skin, definitionName) { TextButtonSkinDefinition skinDefinition = skin.ObtainDefinition(definitionName, GetType()); this.text = new Text(font, text); diff --git a/RecrownedAthenaeum/UI/Modular/Modules/Text.cs b/RecrownedAthenaeum/UI/Modular/Modules/Text.cs index 1421736..3a20cdc 100644 --- a/RecrownedAthenaeum/UI/Modular/Modules/Text.cs +++ b/RecrownedAthenaeum/UI/Modular/Modules/Text.cs @@ -1,5 +1,6 @@ using Microsoft.Xna.Framework; using Microsoft.Xna.Framework.Graphics; +using RecrownedAthenaeum.UI.SkinSystem; using RecrownedAthenaeum.UI.SkinSystem.Definitions; using System.Text; @@ -61,7 +62,7 @@ namespace RecrownedAthenaeum.UI.Modular.Modules /// The name of the skin's definition to use of a . /// The font to be used. /// The string of text to be displayed. - public Text(SkinSystem.Skin skin, SpriteFont font, string skinDefinitionName = null, string content = null) : this(font, content) + public Text(ISkin skin, SpriteFont font, string skinDefinitionName = null, string content = null) : this(font, content) { skinDefinition = skin.ObtainDefinition(skinDefinitionName, GetType()); color = skin.GetColor(skinDefinition.color);