summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRealBadAngel <maciej.kasatkin@o2.pl>2014-06-20 21:30:48 +0200
committerRealBadAngel <maciej.kasatkin@o2.pl>2014-06-20 21:30:48 +0200
commitc86b78c9b725873451102ba78ef0820ce2056487 (patch)
treebeede4fc41ae3e5c406d2cc8ef3fb7aed664a71a
parente81454fb387cd98b4a63ade83a9eb41f1bdca278 (diff)
downloadminetest-c86b78c9b725873451102ba78ef0820ce2056487.tar.gz
minetest-c86b78c9b725873451102ba78ef0820ce2056487.tar.bz2
minetest-c86b78c9b725873451102ba78ef0820ce2056487.zip
Fix labels and vertlabels on some systems.
-rw-r--r--src/cguittfont/CGUITTFont.cpp2
-rw-r--r--src/guiFormSpecMenu.cpp4
2 files changed, 3 insertions, 3 deletions
diff --git a/src/cguittfont/CGUITTFont.cpp b/src/cguittfont/CGUITTFont.cpp
index 73a126a9f..92a24784e 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 6073ed7cc..dcf8387b3 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;