Circle Support for Button

Buttons can now be circular in shape. Improved the shape framework to better encompass circle support.

Author: shivanmodha

src/studios/vanish/engine/Button.java

@@ -2,20 +2,26 @@
 
 import studios.vanish.utility.EventHandler;
 
+
 import java.awt.Font;
 import java.awt.event.MouseEvent;
 public class Button
 {
+	public enum ButtonType
+	{
+		Rectangle, Circle
+	}
 	public Point Location = new Point(0, 0);
 	public Size Size = new Size(130, 25);
 	public String Text = "button";
 	public Font TextFont = new Font("Segoe UI", Font.PLAIN, 11);
 	public Color[] BackColor = {Color.Black, Color.Red, Color.Green};
 	public Color[] ForeColor = {Color.White, Color.Green, Color.Red};
 	public EventHandler OnClick = new EventHandler();
+	public ButtonType Type = ButtonType.Rectangle;
 	public boolean Enabled = true;
 	private int state = 0;
-	private Rectangle rect;
+	private Shape bounds;
 	private boolean down = false;
 	Window wnd;
 	public Button(Window wnd, String text)
@@ -48,14 +54,26 @@ public void SetForeColor(Color normal, Color hover, Color press)
 	}
 	public void Initialize()
 	{
-		rect = new Rectangle(BackColor[state], Location, Size);
+		int rad = Size.Width;
+		if (Size.Height > Size.Width)
+		{
+			rad = Size.Height;
+		}
+		if (Type == ButtonType.Rectangle)
+		{
+			bounds = new Rectangle(BackColor[state], Location, Size);
+		}
+		else if (Type == ButtonType.Circle)
+		{
+			bounds = new Circle(BackColor[state], Location, rad);
+		}
 	}
 	public void Check(Point MouseLocation, int Button)
 	{
 		if (Enabled == true)
 		{
-			rect = new Rectangle(BackColor[state], Location, Size);
-			if (rect.Intersects(MouseLocation))
+			Initialize();
+			if (bounds.Intersects(MouseLocation))
 			{
 				if (wnd.Mouse[MouseEvent.BUTTON1])
 				{
@@ -82,8 +100,9 @@ public void Check(Point MouseLocation, int Button)
 	public void Render(GraphicsUnit Graphics)
 	{
 		Size center = Graphics.GetTextSize(Text, TextFont);
-		Point text = new Point((Location.X + (Size.Width) / 2) - (center.Width / 2), (Location.Y + (Size.Height) / 2) - (center.Height / 2));
-		Graphics.FillRectangle(BackColor[state], Location, Size);
+		Initialize();
+		Point text = new Point(bounds.GetShapeCenter().X - (center.Width / 2), bounds.GetShapeCenter().Y - (center.Height / 2));
+		bounds.Render(Graphics);
 		Graphics.DrawString(Text, ForeColor[state], text, TextFont);
 	}
 }

src/studios/vanish/engine/Circle.java

@@ -73,6 +73,18 @@ else if ((Center.Y > shape.Location.Y) && (Center.Y < shape.Location.Y + shape.S
 		}
 		return false;
 	}
+	public boolean Intersects(Point point)
+	{
+		if (Center.distance(point) < Radius)
+		{
+			return true;
+		}
+		return false;
+	}
+	public Point GetShapeCenter()
+	{
+		return Center;
+	}
 	public void Render(GraphicsUnit Graphics)
 	{
 		Graphics.FillEllipse(Color, new Point(Center.X - Radius, Center.Y - Radius), new Size(Radius * 2, Radius * 2));

src/studios/vanish/engine/Rectangle.java

@@ -21,6 +21,10 @@ public boolean Intersects(Point point)
 		}
 		return false;
 	}
+	public Point GetShapeCenter()
+	{
+		return Location.add(Size.divide(new Size(2, 2)).toPoint());
+	}
 	public void Render(GraphicsUnit Graphics)
 	{
 		Graphics.FillRectangle(Color, Location, Size);

src/studios/vanish/engine/Shape.java

@@ -24,5 +24,7 @@ public void Initialize(Color Color, Point Center, int Radius)
 		this.Location = new Point(this.Center.X - (side / 2), this.Center.Y - (side / 2));
 	}
 	public abstract boolean Intersects(Shape shape);
+	public abstract boolean Intersects(Point point);
 	public abstract void Render(GraphicsUnit Graphics);
+	public abstract Point GetShapeCenter();
 }

src/studios/vanish/utility/Method.java

@@ -10,6 +10,6 @@ public Method(Object _object, String _name)
 	}
 	public Object Invoke(Object... obj)
 	{
-		return Spark.InvokeMethod(Handle, Name, obj);
+		return Utility.InvokeMethod(Handle, Name, obj);
 	}
 }

src/studios/vanish/utility/Spark.java src/studios/vanish/utility/Utility.javasrc/studios/vanish/utility/Spark.java renamed to src/studios/vanish/utility/Utility.java

@@ -1,12 +1,12 @@
 package studios.vanish.utility;
-public class Spark
+public class Utility
 {
 	public static Object InvokeMethod(Object _object, String _method, Object... _parameters)
 	{
 		Object _return = false;
 		try
 		{			
-			_return = _object.getClass().getMethod(_method, Spark.GetClassType(_parameters)).invoke(_object, _parameters);
+			_return = _object.getClass().getMethod(_method, Utility.GetClassType(_parameters)).invoke(_object, _parameters);
 			if (_return == null)
 			{
 				_return = "success: return type null";