Move style into Component

1 files changed, 1 insertions, 20 deletions

diff --git a/src/interface/Button.h b/src/interface/Button.h
index 6f485cb..61430ad 100644
--- a/src/interface/Button.h
+++ b/src/interface/Button.h
@@ -29,7 +29,6 @@ public:
 	Button(Point position = Point(0, 0), Point size = Point(0, 0), std::string buttonText = "");
 	virtual ~Button();
 
-	Icon icon;
 	bool Toggleable;
 	bool Enabled;
 
@@ -42,6 +41,7 @@ public:
 
 	virtual void Draw(const Point& screenPos);
 
+	virtual void TextPosition();
 	inline bool GetState() { return state; }
 	virtual void DoAction(); //action of button what ever it may be
 	void SetTogglable(bool isTogglable);
@@ -50,34 +50,15 @@ public:
 	inline void SetToggleState(bool state);
 	void SetActionCallback(ButtonAction * action);
 	ButtonAction * GetActionCallback() { return actionCallback; }
-	void TextPosition();
 	void SetText(std::string buttonText);
-
-	HorizontalAlignment GetHAlignment() { return textHAlign; }
-	VerticalAlignment GetVAlignment() { return textVAlign; }
-	void SetAlignment(HorizontalAlignment hAlign, VerticalAlignment vAlign) { textHAlign = hAlign; textVAlign = vAlign; TextPosition(); }
-
-	void SetBackgroundColour(Colour background) { this->background = background; }
-	void SetActiveBackgroundColour(Colour background) { this->activeBackground = background; }
-	void SetBorderColour(Colour border) { this->border = border; }
-	void SetActiveBorderColour(Colour border) { this->activeBorder = border; }
-	void SetTextColour(Colour text) { this->text = text; }
-	void SetActiveTextColour(Colour text) { this->activeText = text; }
-
 	void SetIcon(Icon icon);
 protected:
-	Colour background, activeBackground;
-	Colour border, activeBorder;
-	Colour text, activeText;
 
 	std::string buttonDisplayText;
 	std::string ButtonText;
 
 	bool isButtonDown, state, isMouseInside, isTogglable, toggle;
 	ButtonAction * actionCallback;
-	ui::Point textPosition;
-	HorizontalAlignment textHAlign;
-	VerticalAlignment textVAlign;
 
 };
 }