From 78eaf49c07bf015a330fe321012bf141d85bb7ef Mon Sep 17 00:00:00 2001
From: zetaPRIME <qmanxt@gmail.com>
Date: Fri, 17 Mar 2017 07:10:07 -0400
Subject: [PATCH] remove redundant justification from Label field and give
 MessageBox its own TextConfig in metrics

---
 libstarlight/source/starlight/dialog/MessageBox.cpp | 2 +-
 libstarlight/source/starlight/ui/Label.cpp          | 4 ++--
 libstarlight/source/starlight/ui/Label.h            | 1 -
 themes/default/metrics.json                         | 6 +++++-
 4 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/libstarlight/source/starlight/dialog/MessageBox.cpp b/libstarlight/source/starlight/dialog/MessageBox.cpp
index 864fc27..10b69d0 100644
--- a/libstarlight/source/starlight/dialog/MessageBox.cpp
+++ b/libstarlight/source/starlight/dialog/MessageBox.cpp
@@ -35,7 +35,7 @@ MessageBox::MessageBox(Mode m, const std::string& msg, std::function<void(int)>
     touchScreen->Add(scroll);
     auto label = std::make_shared<Label>(VRect(0, 0, scroll->rect.size.x, 0));
     label->autoSizeV = true;
-    label->SetPreset("normal.16");
+    label->textConfig = ThemeManager::GetMetric<TextConfig>("/dialogs/messageBox/text");
     label->SetText(msg);
     scroll->Add(label);
     
diff --git a/libstarlight/source/starlight/ui/Label.cpp b/libstarlight/source/starlight/ui/Label.cpp
index b247032..e3f960f 100644
--- a/libstarlight/source/starlight/ui/Label.cpp
+++ b/libstarlight/source/starlight/ui/Label.cpp
@@ -48,7 +48,7 @@ void Label::PreDraw() {
         buffer = std::make_unique<gfx::DrawContextCanvas>(rect.size + Vector2(0, 8));
         buffer->Clear();
         GFXManager::PushContext(buffer.get());
-        textConfig.Print(buffer->rect, text, justification);
+        textConfig.Print(buffer->rect, text);
         GFXManager::PopContext();
     }
 }
@@ -58,6 +58,6 @@ void Label::Draw() {
     if (buffer) {
         buffer->Draw(VRect(rect.pos, buffer->rect.size));
     } else {
-        textConfig.Print(rect, text, justification);
+        textConfig.Print(rect, text);
     }
 }
diff --git a/libstarlight/source/starlight/ui/Label.h b/libstarlight/source/starlight/ui/Label.h
index 72d348c..db4792f 100644
--- a/libstarlight/source/starlight/ui/Label.h
+++ b/libstarlight/source/starlight/ui/Label.h
@@ -24,7 +24,6 @@ namespace starlight {
             std::unique_ptr<gfx::DrawContextCanvas> buffer;
             
             bool autoSizeV = false;
-            Vector2 justification = Vector2::half;
             
             Label(VRect rect);
             ~Label() override { }
diff --git a/themes/default/metrics.json b/themes/default/metrics.json
index 48ad86e..b7fb36d 100644
--- a/themes/default/metrics.json
+++ b/themes/default/metrics.json
@@ -38,7 +38,11 @@
     
     "dialogs" : {
         "messageBox" : {
-            "size" : [240, 160]
+            "size" : [240, 160],
+            "text" : {
+                "_inherit" : "/textPresets/normal.12",
+                "justification" : [0.5, 0]
+            }
         },
         "OSK" : {
             "preview" : {