From d0416f86344e4f863ba2677aa91cad32c06be6ab Mon Sep 17 00:00:00 2001
From: Aloshi <allofquist@yahoo.com>
Date: Sat, 19 Apr 2014 14:15:44 -0500
Subject: [PATCH] Can now specify font for MenuComponent's title.

---
 src/components/MenuComponent.cpp | 21 ++++++++++++++++-----
 src/components/MenuComponent.h   |  4 +++-
 2 files changed, 19 insertions(+), 6 deletions(-)

diff --git a/src/components/MenuComponent.cpp b/src/components/MenuComponent.cpp
index 3deddd040..622d9e6bc 100644
--- a/src/components/MenuComponent.cpp
+++ b/src/components/MenuComponent.cpp
@@ -4,9 +4,11 @@
 #define BUTTON_GRID_VERT_PADDING 32
 #define BUTTON_GRID_HORIZ_PADDING 10
 
+#define TITLE_HEIGHT (mTitle->getFont()->getLetterHeight() + Renderer::getScreenHeight()*0.0637f)
+
 using namespace Eigen;
 
-MenuComponent::MenuComponent(Window* window, const char* title) : GuiComponent(window), 
+MenuComponent::MenuComponent(Window* window, const char* title, const std::shared_ptr<Font>& titleFont) : GuiComponent(window), 
 	mBackground(window), mGrid(window, Vector2i(1, 3))
 {	
 	addChild(&mBackground);
@@ -14,8 +16,11 @@ MenuComponent::MenuComponent(Window* window, const char* title) : GuiComponent(w
 
 	mBackground.setImagePath(":/frame.png");
 
-	// set up title which will never change
-	mTitle = std::make_shared<TextComponent>(mWindow, strToUpper(title), Font::get(FONT_SIZE_LARGE), 0x555555FF, TextComponent::ALIGN_CENTER);
+	// set up title
+	mTitle = std::make_shared<TextComponent>(mWindow);
+	mTitle->setAlignment(TextComponent::ALIGN_CENTER);
+	mTitle->setColor(0x555555FF);
+	setTitle(title, titleFont);
 	mGrid.setEntry(mTitle, Vector2i(0, 0), false);
 
 	// set up list which will never change (externally, anyway)
@@ -28,6 +33,12 @@ MenuComponent::MenuComponent(Window* window, const char* title) : GuiComponent(w
 	mGrid.resetCursor();
 }
 
+void MenuComponent::setTitle(const char* title, const std::shared_ptr<Font>& font)
+{
+	mTitle->setText(strToUpper(title));
+	mTitle->setFont(font);
+}
+
 float MenuComponent::getButtonGridHeight() const
 {
 	return (mButtonGrid ? mButtonGrid->getSize().y() : Font::get(FONT_SIZE_MEDIUM)->getHeight() + BUTTON_GRID_VERT_PADDING);
@@ -35,7 +46,7 @@ float MenuComponent::getButtonGridHeight() const
 
 void MenuComponent::updateSize()
 {
-	float height = mTitle->getSize().y() + mList->getTotalRowHeight() + getButtonGridHeight() + 2;
+	float height = TITLE_HEIGHT + mList->getTotalRowHeight() + getButtonGridHeight() + 2;
 	if(height > Renderer::getScreenHeight() * 0.7f)
 		height = Renderer::getScreenHeight() * 0.7f;
 
@@ -47,7 +58,7 @@ void MenuComponent::onSizeChanged()
 	mBackground.fitTo(mSize, Eigen::Vector3f::Zero(), Eigen::Vector2f(-32, -32));
 
 	// update grid row/col sizes
-	mGrid.setRowHeightPerc(0, mTitle->getSize().y() / mSize.y());
+	mGrid.setRowHeightPerc(0, TITLE_HEIGHT / mSize.y());
 	mGrid.setRowHeightPerc(2, getButtonGridHeight() / mSize.y());
 	
 	mGrid.setSize(mSize);
diff --git a/src/components/MenuComponent.h b/src/components/MenuComponent.h
index 319152b09..a1e570596 100644
--- a/src/components/MenuComponent.h
+++ b/src/components/MenuComponent.h
@@ -15,7 +15,7 @@ std::shared_ptr<ImageComponent> makeArrow(Window* window);
 class MenuComponent : public GuiComponent
 {
 public:
-	MenuComponent(Window* window, const char* title);
+	MenuComponent(Window* window, const char* title, const std::shared_ptr<Font>& titleFont = Font::get(FONT_SIZE_LARGE));
 
 	void onSizeChanged() override;
 
@@ -31,6 +31,8 @@ public:
 
 	void addButton(const std::string& label, const std::string& helpText, const std::function<void()>& callback);
 
+	void setTitle(const char* title, const std::shared_ptr<Font>& font);
+
 	inline void setCursorToList() { mGrid.setCursorTo(mList); }
 	inline void setCursorToButtons() { assert(mButtonGrid); mGrid.setCursorTo(mButtonGrid); }