diff --git a/ZoFo/Content/Content.mgcb b/ZoFo/Content/Content.mgcb index a42d9d4..545a5b8 100644 --- a/ZoFo/Content/Content.mgcb +++ b/ZoFo/Content/Content.mgcb @@ -449,6 +449,18 @@ /processorParam:TextureFormat=Color /build:Textures/GUI/Button2.png +#begin Textures/GUI/ButtonI.png +/importer:TextureImporter +/processor:TextureProcessor +/processorParam:ColorKeyColor=255,0,255,255 +/processorParam:ColorKeyEnabled=True +/processorParam:GenerateMipmaps=False +/processorParam:PremultiplyAlpha=True +/processorParam:ResizeToPowerOfTwo=False +/processorParam:MakeSquare=False +/processorParam:TextureFormat=Color +/build:Textures/GUI/ButtonI.png + #begin Textures/GUI/checkboxs_off-on.png /importer:TextureImporter /processor:TextureProcessor diff --git a/ZoFo/Content/Textures/GUI/Button.png b/ZoFo/Content/Textures/GUI/Button.png index d1d11e9..8ea9806 100644 Binary files a/ZoFo/Content/Textures/GUI/Button.png and b/ZoFo/Content/Textures/GUI/Button.png differ diff --git a/ZoFo/Content/Textures/GUI/ButtonI.png b/ZoFo/Content/Textures/GUI/ButtonI.png new file mode 100644 index 0000000..fab43a9 Binary files /dev/null and b/ZoFo/Content/Textures/GUI/ButtonI.png differ diff --git a/ZoFo/Content/Textures/GUI/back.png b/ZoFo/Content/Textures/GUI/back.png index 951ca6c..86bef42 100644 Binary files a/ZoFo/Content/Textures/GUI/back.png and b/ZoFo/Content/Textures/GUI/back.png differ diff --git a/ZoFo/GameCore/GUI/BaseGUI.cs b/ZoFo/GameCore/GUI/BaseGUI.cs index fb2dbd5..cfdd76b 100644 --- a/ZoFo/GameCore/GUI/BaseGUI.cs +++ b/ZoFo/GameCore/GUI/BaseGUI.cs @@ -54,7 +54,6 @@ public class BaseGUI : AbstractGUI rectangle = new Rectangle(width / 2 - (height / 16 + (int)(width / 2.5)) / 2, height / 2 - (int)(height / 1.5) / 2, height / 40 + width / 5, (int)(height / 1.5)), - mainColor = Color.LightGray, textureName = "Textures/GUI/Back" }; Elements.Add(baseItemBack); @@ -62,7 +61,6 @@ public class BaseGUI : AbstractGUI { rectangle = new Rectangle(width / 2 + height / 160, height / 2 - (int)(height / 1.5) / 2, height / 40 + width / 5, (int)(height / 1.5)), - mainColor = Color.LightGray, textureName = "Textures/GUI/Back" }; Elements.Add(baseCraftBack); diff --git a/ZoFo/GameCore/GUI/HUD.cs b/ZoFo/GameCore/GUI/HUD.cs index d75502a..027664c 100644 --- a/ZoFo/GameCore/GUI/HUD.cs +++ b/ZoFo/GameCore/GUI/HUD.cs @@ -39,9 +39,9 @@ public class HUD : AbstractGUI }; Button invButton = new Button(Manager) { - fontName = "Fonts\\Font3", scale = 0.4f, text = "inv", fontColor = Color.Black, + fontName = "Fonts\\Font3", scale = 0.4f, fontColor = Color.Black, mainColor = Color.Transparent, rectangle = new Rectangle(width - width / 30 - width / 40, height / 15 + width / 40, width / 40, width / 40), - textureName = "Textures/GUI/Button2" + textureName = "Textures/GUI/ButtonI" }; Elements.Add(invButton); invButton.LeftButtonPressed += () =>