From: RealBadAngel <maciej.kasatkin@o2.pl>
Date: Fri, 20 Jun 2014 19:30:48 +0000 (+0200)
Subject: Fix labels and vertlabels on some systems.
X-Git-Url: http://81.2.79.47:8989/gitweb/?a=commitdiff_plain;h=c86b78c9b725873451102ba78ef0820ce2056487;p=zefram%2Fminetest%2Fminetest_engine.git

Fix labels and vertlabels on some systems.
---

diff --git a/src/cguittfont/CGUITTFont.cpp b/src/cguittfont/CGUITTFont.cpp
index 73a126a9..92a24784 100644
--- a/src/cguittfont/CGUITTFont.cpp
+++ b/src/cguittfont/CGUITTFont.cpp
@@ -583,7 +583,7 @@ void CGUITTFont::draw(const core::stringw& text, const core::rect<s32>& position
 		if (lineBreak)
 		{
 			previousChar = 0;
-			offset.Y += font_metrics.ascender / 64;
+			offset.Y += font_metrics.height / 64;
 			offset.X = position.UpperLeftCorner.X;
 
 			if (hcenter)
diff --git a/src/guiFormSpecMenu.cpp b/src/guiFormSpecMenu.cpp
index 6073ed7c..dcf8387b 100644
--- a/src/guiFormSpecMenu.cpp
+++ b/src/guiFormSpecMenu.cpp
@@ -1111,7 +1111,7 @@ void GUIFormSpecMenu::parseLabel(parserData* data,std::string element)
 			L"",
 			258+m_fields.size()
 		);
-		Environment->addStaticText(spec.flabel.c_str(), rect, false, true, this, spec.fid);
+		Environment->addStaticText(spec.flabel.c_str(), rect, false, false, this, spec.fid);
 		m_fields.push_back(spec);
 		return;
 	}
@@ -1157,7 +1157,7 @@ void GUIFormSpecMenu::parseVertLabel(parserData* data,std::string element)
 			258+m_fields.size()
 		);
 		gui::IGUIStaticText *t =
-				Environment->addStaticText(spec.flabel.c_str(), rect, false, true, this, spec.fid);
+				Environment->addStaticText(spec.flabel.c_str(), rect, false, false, this, spec.fid);
 		t->setTextAlignment(gui::EGUIA_CENTER, gui::EGUIA_CENTER);
 		m_fields.push_back(spec);
 		return;