From 3eb375904c32ba22b3cd9797b6197ead614d6cb2 Mon Sep 17 00:00:00 2001
From: Mark Vejvoda <mark_vejvoda@hotmail.com>
Date: Tue, 30 Aug 2011 21:48:32 +0000
Subject: [PATCH] - bugfix for text placement in progress bars

---
 source/glest_game/graphics/renderer.cpp       | 13 ++++++++-
 .../menu/menu_state_connected_game.cpp        | 22 +++++++++++----
 source/glest_game/menu/menu_state_mods.cpp    | 28 +++++++++++++------
 3 files changed, 48 insertions(+), 15 deletions(-)

diff --git a/source/glest_game/graphics/renderer.cpp b/source/glest_game/graphics/renderer.cpp
index 962c7ba0..e13eee78 100644
--- a/source/glest_game/graphics/renderer.cpp
+++ b/source/glest_game/graphics/renderer.cpp
@@ -1633,6 +1633,8 @@ Vec2f Renderer::getCentered3DPos(const string &text, Font3D *font, Vec2f &pos, i
 		//pos.y += (lineHeight / 2.f); // y starts at the middle of the render position, so only move up 1/2 the font height
 
 		if(lineHeight < h) {
+			//printf("line %d, lineHeight [%f] h [%d] text [%s]\n",__LINE__,lineHeight,h,text.c_str());
+
 			//int realHeight = lineHeight + (h - lineHeight);
 			// First go to top of bounding box
 			pos.y += (h - lineHeight);
@@ -1643,6 +1645,15 @@ Vec2f Renderer::getCentered3DPos(const string &text, Font3D *font, Vec2f &pos, i
 			//pos.y -= (realHeight / 2);
 			//pos.y += (lineHeight / 2);
 		}
+		else if(lineHeight > h) {
+			//printf("line %d, lineHeight [%f] h [%d] text [%s]\n",__LINE__,lineHeight,h,text.c_str());
+
+#ifdef USE_STREFLOP
+			pos.y += (streflop::ceil((float)lineHeight - (float)h));
+#else
+			pos.y += (ceil(lineHeight - h));
+#endif
+		}
 	}
 	return pos;
 }
@@ -5804,7 +5815,7 @@ void Renderer::renderArrow(const Vec3f &pos1, const Vec3f &pos2,
 void Renderer::renderProgressBar3D(int size, int x, int y, Font3D *font, int customWidth,
 		string prefixLabel,bool centeredText) {
 
-	int progressbarHeight	= 10;
+	int progressbarHeight	= 12;
     int currentSize     	= size;
     int maxSize         	= maxProgressBar;
     string renderText   	= intToStr(static_cast<int>(size)) + "%";
diff --git a/source/glest_game/menu/menu_state_connected_game.cpp b/source/glest_game/menu/menu_state_connected_game.cpp
index 337b30a6..7ccde0c6 100644
--- a/source/glest_game/menu/menu_state_connected_game.cpp
+++ b/source/glest_game/menu/menu_state_connected_game.cpp
@@ -1023,12 +1023,22 @@ void MenuStateConnectedGame::render() {
                 string progressLabelPrefix = lang.get("ModDownloading") + " " + iterMap->first + " ";
                 //if(SystemFlags::VERBOSE_MODE_ENABLED) printf("\nRendering file progress with the following prefix [%s]\n",progressLabelPrefix.c_str());
 
-                renderer.renderProgressBar(
-                    iterMap->second.first,
-                    10,
-                    yLocation,
-                    CoreData::getInstance().getDisplayFontSmall(),
-                    350,progressLabelPrefix);
+                if(Renderer::renderText3DEnabled) {
+					renderer.renderProgressBar3D(
+						iterMap->second.first,
+						10,
+						yLocation,
+						CoreData::getInstance().getDisplayFontSmall3D(),
+						350,progressLabelPrefix);
+                }
+                else {
+					renderer.renderProgressBar(
+						iterMap->second.first,
+						10,
+						yLocation,
+						CoreData::getInstance().getDisplayFontSmall(),
+						350,progressLabelPrefix);
+                }
 
                 yLocation -= 10;
             }
diff --git a/source/glest_game/menu/menu_state_mods.cpp b/source/glest_game/menu/menu_state_mods.cpp
index 8fce4707..3cc782b3 100644
--- a/source/glest_game/menu/menu_state_mods.cpp
+++ b/source/glest_game/menu/menu_state_mods.cpp
@@ -1914,14 +1914,26 @@ void MenuStateMods::render() {
                 string progressLabelPrefix = lang.get("ModDownloading") + " " + extractFileFromDirectoryPath(iterMap->first) + " ";
                 //if(SystemFlags::VERBOSE_MODE_ENABLED) printf("\nRendering file progress with the following prefix [%s]\n",progressLabelPrefix.c_str());
 
-                renderer.renderProgressBar(
-                    iterMap->second.first,
-                    //10,
-                    //yLocation,
-                    xLocation,
-                    yLocation,
-                    CoreData::getInstance().getDisplayFontSmall(),
-                    185,progressLabelPrefix,false);
+                if(Renderer::renderText3DEnabled) {
+					renderer.renderProgressBar3D(
+						iterMap->second.first,
+						//10,
+						//yLocation,
+						xLocation,
+						yLocation,
+						CoreData::getInstance().getDisplayFontSmall3D(),
+						185,progressLabelPrefix,false);
+                }
+                else {
+					renderer.renderProgressBar(
+						iterMap->second.first,
+						//10,
+						//yLocation,
+						xLocation,
+						yLocation,
+						CoreData::getInstance().getDisplayFontSmall(),
+						185,progressLabelPrefix,false);
+                }
 
                 yLocation -= 14;
             }