X-Git-Url: http://git.localhorst.tv/?a=blobdiff_plain;f=src%2Fui%2FWidget.hpp;h=a69defbcfc45a4cb1b2dcd510b9fb4a2cb540eb5;hb=8f6530c75730f901efd6708e4fde7e68a178adf1;hp=cb83da251dbd9311ef2e04cd79d8b7a842d534a0;hpb=56f570e713c42d30109a214e68a2beed96ba1999;p=blobs.git

diff --git a/src/ui/Widget.hpp b/src/ui/Widget.hpp
index cb83da2..a69defb 100644
--- a/src/ui/Widget.hpp
+++ b/src/ui/Widget.hpp
@@ -1,8 +1,7 @@
 #ifndef BLOBS_UI_WIDGET_HPP_
 #define BLOBS_UI_WIDGET_HPP_
 
-#include "align.hpp"
-#include "../graphics/glm.hpp"
+#include "../math/glm.hpp"
 
 
 namespace blobs {
@@ -27,20 +26,18 @@ public:
 	Widget &operator =(Widget &&) = delete;
 
 public:
-	Widget &Position(const glm::vec3 &p) noexcept { pos = p; return *this; }
-	const glm::vec3 &Position() const noexcept { return pos; }
-	glm::vec3 AlignedPosition() noexcept;
-	glm::vec3 TopLeft() noexcept;
+	Widget *Position(const glm::vec2 &p) noexcept { pos = p; return this; }
+	const glm::vec2 &Position() const noexcept { return pos; }
 
-	Widget &Origin(Gravity o) noexcept { origin = o; return *this; }
-	Gravity Origin() const noexcept { return origin; }
+	Widget *ZIndex(float z) noexcept { z_index = z; return this; }
+	float ZIndex() const noexcept { return z_index; }
 
 	virtual glm::vec2 Size() = 0;
 	virtual void Draw(app::Assets &, graphics::Viewport &) noexcept = 0;
 
 private:
-	glm::vec3 pos;
-	Gravity origin;
+	glm::vec2 pos;
+	float z_index;
 
 };