Fix labels and vertlabels on some systems.

RealBadAngel · RealBadAngel · commit c86b78c9b725 · 2014-06-20T21:30:48.000+02:00
diff --git 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
@@ -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;

Original file line number	Diff line number	Diff line change
`@@ -583,7 +583,7 @@ void CGUITTFont::draw(const core::stringw& text, const core::rect<s32>& position`
`583`	`583`	`if (lineBreak)`
`584`	`584`	`{`
`585`	`585`	`previousChar = 0;`
`586`		`- offset.Y += font_metrics.ascender / 64;`
	`586`	`+ offset.Y += font_metrics.height / 64;`
`587`	`587`	`offset.X = position.UpperLeftCorner.X;`
`588`	`588`
`589`	`589`	`if (hcenter)`