X-Git-Url: http://git.localhorst.tv/?a=blobdiff_plain;f=src%2Fui%2Fwidgets.cpp;h=a81defc0e549cc983795808a71c45988c154e4f7;hb=392826deaf802ac0960ed3924a3f98b9d18d381b;hp=6ce92dbc2c894d029db36c33aa6d630b7fe2e82d;hpb=fd08d1defb5c42d2847a9001e1921898e3d526bf;p=blobs.git

diff --git a/src/ui/widgets.cpp b/src/ui/widgets.cpp
index 6ce92db..a81defc 100644
--- a/src/ui/widgets.cpp
+++ b/src/ui/widgets.cpp
@@ -7,6 +7,8 @@
 #include "../graphics/Font.hpp"
 #include "../graphics/Viewport.hpp"
 
+#include <iomanip>
+#include <sstream>
 #include <glm/gtx/transform.hpp>
 
 
@@ -60,6 +62,7 @@ glm::vec2 Label::Size() {
 }
 
 void Label::Draw(app::Assets &assets, graphics::Viewport &viewport) noexcept {
+	if (text.empty()) return;
 	Update();
 	glm::vec2 size = Size();
 
@@ -73,7 +76,7 @@ void Label::Draw(app::Assets &assets, graphics::Viewport &viewport) noexcept {
 }
 
 void Label::Update() {
-	if (!dirty) return;
+	if (!dirty || text.empty()) return;
 	font->Render(text, tex);
 	dirty = false;
 }
@@ -110,10 +113,12 @@ void Meter::Draw(app::Assets &assets, graphics::Viewport &viewport) noexcept {
 	}
 
 	if (value > 0.0f) {
+		glm::vec2 bottom_right = Position() + fullsize - glm::vec2(border) - padding;
+		bottom_right.x -= size.x * (1.0f - value);
 		assets.shaders.canvas.SetColor(fill_color);
 		assets.shaders.canvas.FillRect(
 			Position() + glm::vec2(border) + padding,
-			Position() + fullsize - glm::vec2(border) - padding
+			bottom_right
 		);
 	}
 }
@@ -168,15 +173,17 @@ Panel *Panel::Spacing(float s) {
 
 Panel *Panel::Direction(Dir d) {
 	dir = d;
-	Relayout();
+	Layout();
 	return this;
 }
 
 glm::vec2 Panel::Size() {
-	return (2.0f * padding) + glm::vec2(0.0f, (widgets.size() - 1) * spacing) + size;
+	glm::vec2 space(0.0f);
+	space[dir] = (widgets.size() - 1) * spacing;
+	return (2.0f * padding) + space + size;
 }
 
-void Panel::Relayout() {
+void Panel::Layout() {
 	size = glm::vec2(0.0f);
 	if (dir == HORIZONTAL) {
 		for (auto &w : widgets) {
@@ -194,6 +201,8 @@ void Panel::Relayout() {
 }
 
 void Panel::Draw(app::Assets &assets, graphics::Viewport &viewport) noexcept {
+	// TODO: separate draw and layout, it's inefficient and the wrong tree order anyway
+	Layout();
 	if (bg_color.a > 0.0f) {
 		assets.shaders.canvas.Activate();
 		assets.shaders.canvas.ZIndex(ZIndex());
@@ -201,9 +210,7 @@ void Panel::Draw(app::Assets &assets, graphics::Viewport &viewport) noexcept {
 		assets.shaders.canvas.FillRect(Position(), Position() + Size());
 	}
 
-	glm::vec2 cursor = Position();
-	cursor.x += padding.x;
-	cursor.y += padding.y;
+	glm::vec2 cursor = Position() + padding;
 	for (auto &w : widgets) {
 		w->Position(cursor)->ZIndex(ZIndex() + 1.0f);
 		w->Draw(assets, viewport);