Working on fixing minor bugs

src/UiManager.cpp

@@ -57,6 +57,7 @@ namespace ZL {
 		case ButtonState::Normal: tex = &texNormal; break;
 		case ButtonState::Hover: tex = &texHover; break;
 		case ButtonState::Pressed: tex = &texPressed; break;
+		case ButtonState::Disabled: tex = &texDisabled; break;
 		}
 		if (!(*tex)) return;
 
@@ -290,6 +291,9 @@ namespace ZL {
 			btn->texNormal = loadTex("normal");
 			btn->texHover = loadTex("hover");
 			btn->texPressed = loadTex("pressed");
+			btn->texDisabled = loadTex("disabled");
+
+			btn->border = j.value("border", 0.0f);
 
 			node->button = btn;
 		}
@@ -1049,11 +1053,14 @@ namespace ZL {
 
 	void UiManager::onMouseMove(int x, int y) {
 		for (auto& b : buttons) {
-			if (b->rect.contains((float)x, (float)y)) {
-				if (b->state != ButtonState::Pressed) b->state = ButtonState::Hover;
-			}
-			else {
-				if (b->state != ButtonState::Pressed) b->state = ButtonState::Normal;
+			if (b->state != ButtonState::Disabled)
+			{
+				if (b->rect.containsConsideringBorder((float)x, (float)y, b->border)) {
+					if (b->state != ButtonState::Pressed) b->state = ButtonState::Hover;
+				}
+				else {
+					if (b->state != ButtonState::Pressed) b->state = ButtonState::Normal;
+				}
 			}
 		}
 
@@ -1074,11 +1081,15 @@ namespace ZL {
 		}
 	}
 
+
 	void UiManager::onMouseDown(int x, int y) {
 		for (auto& b : buttons) {
-			if (b->rect.contains((float)x, (float)y)) {
-				b->state = ButtonState::Pressed;
-				pressedButton = b;
+			if (b->state != ButtonState::Disabled)
+			{
+				if (b->rect.containsConsideringBorder((float)x, (float)y, b->border)) {
+					b->state = ButtonState::Pressed;
+					pressedButton = b;
+				}
 			}
 		}