Tags, fixes #55

3 files changed, 34 insertions, 16 deletions

diff --git a/src/interface/Appearance.cpp b/src/interface/Appearance.cpp
index b504d02..45c3592 100644
--- a/src/interface/Appearance.cpp
+++ b/src/interface/Appearance.cpp
@@ -14,18 +14,21 @@ namespace ui
 		HorizontalAlign(AlignCentre),
 		VerticalAlign(AlignMiddle),
 	
-		BackgroundHover(30, 30, 30),
+		BackgroundHover(20, 20, 20),
 		BackgroundInactive(0, 0, 0),
 		BackgroundActive(255, 255, 255),
-		BackgroundDisabled(100, 100, 100),
+		BackgroundDisabled(10, 10, 10),
 		
 		TextHover(255, 255, 255),
 		TextInactive(255, 255, 255),
 		TextActive(0, 0, 0),
+		TextDisabled(100, 100, 100),
 		
 		BorderHover(255, 255, 255),
 		BorderInactive(200, 200, 200),
-		BorderActive(255, 255, 255),
+		BorderActive(235, 235, 235),
+		BorderDisabled(100, 100, 100),
+
 		Margin(1, 4),
 	
 		icon(NoIcon),
diff --git a/src/interface/Appearance.h b/src/interface/Appearance.h
index 4767edb..e6f0a93 100644
--- a/src/interface/Appearance.h
+++ b/src/interface/Appearance.h
@@ -40,10 +40,12 @@ namespace ui
 		ui::Colour TextHover;
 		ui::Colour TextInactive;
 		ui::Colour TextActive;
+		ui::Colour TextDisabled;
 		
 		ui::Colour BorderHover;
 		ui::Colour BorderInactive;
 		ui::Colour BorderActive;
+		ui::Colour BorderDisabled;
 		
 		ui::Border Margin;
 		
diff --git a/src/interface/Button.cpp b/src/interface/Button.cpp
index 996c02f..a9b0606 100644
--- a/src/interface/Button.cpp
+++ b/src/interface/Button.cpp
@@ -86,32 +86,45 @@ void Button::Draw(const Point& screenPos)
 	Graphics * g = ui::Engine::Ref().g;
 	Point Position = screenPos;
 	ui::Colour bgColour(0, 0, 0);
+
+	ui::Colour textColour = Appearance.TextInactive;
+	ui::Colour borderColour = Appearance.BorderInactive;
+	ui::Colour backgroundColour = Appearance.BackgroundInactive;
+
 	if(Enabled)
 	{
 		if(isButtonDown || (isTogglable && toggle))
 		{
-			bgColour = Appearance.BackgroundActive;
-			g->fillrect(Position.X+1, Position.Y+1, Size.X-2, Size.Y-2, Appearance.BackgroundActive.Red, Appearance.BackgroundActive.Green, Appearance.BackgroundActive.Blue, 255);
-			g->drawrect(Position.X, Position.Y, Size.X, Size.Y, Appearance.BorderActive.Red, Appearance.BorderActive.Green, Appearance.BorderActive.Blue, 255);
-			g->drawtext(Position.X+textPosition.X, Position.Y+textPosition.Y, buttonDisplayText, Appearance.TextActive.Red, Appearance.TextActive.Green, Appearance.TextActive.Blue, 255);
+			textColour = Appearance.TextActive;
+			borderColour = Appearance.BorderActive;
+			backgroundColour = Appearance.BackgroundActive;
+		}
+		else if (isMouseInside)
+		{
+			textColour = Appearance.TextHover;
+			borderColour = Appearance.BorderHover;
+			backgroundColour = Appearance.BackgroundHover;
 		}
 		else
 		{
-			bgColour = Appearance.BackgroundInactive;
-			g->fillrect(Position.X+1, Position.Y+1, Size.X-2, Size.Y-2, Appearance.BackgroundInactive.Red, Appearance.BackgroundInactive.Green, Appearance.BackgroundInactive.Blue, 255);
-			g->drawrect(Position.X, Position.Y, Size.X, Size.Y, Appearance.BorderInactive.Red, Appearance.BorderInactive.Green, Appearance.BorderInactive.Blue, 255);
-			g->drawtext(Position.X+textPosition.X, Position.Y+textPosition.Y, buttonDisplayText, Appearance.TextInactive.Red, Appearance.TextInactive.Green, Appearance.TextInactive.Blue, 255);
+			textColour = Appearance.TextInactive;
+			borderColour = Appearance.BorderInactive;
+			backgroundColour = Appearance.BackgroundInactive;
 		}
 	}
 	else
 	{
-		bgColour = Appearance.BackgroundInactive;
-		g->fillrect(Position.X+1, Position.Y+1, Size.X-2, Size.Y-2, Appearance.BackgroundInactive.Red, Appearance.BackgroundInactive.Green, Appearance.BackgroundInactive.Blue, 180);
-		g->drawrect(Position.X, Position.Y, Size.X, Size.Y, Appearance.BackgroundDisabled.Red, Appearance.BackgroundDisabled.Green, Appearance.BackgroundDisabled.Blue, Appearance.BackgroundDisabled.Alpha);
-		g->drawtext(Position.X+textPosition.X, Position.Y+textPosition.Y, buttonDisplayText, 180, 180, 180, 255);
+		textColour = Appearance.TextDisabled;
+		borderColour = Appearance.BorderDisabled;
+		backgroundColour = Appearance.BackgroundDisabled;
 	}
 
-	bool iconInvert = (bgColour.Blue + (3*bgColour.Green) + (2*bgColour.Red))>544?true:false;
+	bgColour = Appearance.BackgroundInactive;
+	g->fillrect(Position.X+1, Position.Y+1, Size.X-2, Size.Y-2, backgroundColour.Red, backgroundColour.Green, backgroundColour.Blue, backgroundColour.Alpha);
+	g->drawrect(Position.X, Position.Y, Size.X, Size.Y, borderColour.Red, borderColour.Green, borderColour.Blue, borderColour.Alpha);
+	g->drawtext(Position.X+textPosition.X, Position.Y+textPosition.Y, buttonDisplayText, textColour.Red, textColour.Green, textColour.Blue, textColour.Alpha);
+
+	bool iconInvert = (backgroundColour.Blue + (3*backgroundColour.Green) + (2*backgroundColour.Red))>544?true:false;
 
 	if(Appearance.icon)
 	{