FGFS-4.1/simgear
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Canvas::Text: add line-height property.

Browse Source
This commit is contained in:
Thomas Geymayer
2013-07-19 23:38:08 +02:00
parent a9fc84d568
commit fc75b0bd21
1 changed files with 8 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
simgear/canvas/elements/CanvasText.cxx
+8
View File
@@ -36,6 +36,7 @@ namespace canvas
void setFontResolution(int res); void setFontResolution(int res);
void setCharacterAspect(float aspect); void setCharacterAspect(float aspect);
void setLineHeight(float factor);
void setFill(const std::string& fill); void setFill(const std::string& fill);
void setBackgroundColor(const std::string& fill); void setBackgroundColor(const std::string& fill);
@@ -69,6 +70,12 @@ namespace canvas
setCharacterSize(getCharacterHeight(), aspect); setCharacterSize(getCharacterHeight(), aspect);
} }
//----------------------------------------------------------------------------
void Text::TextOSG::setLineHeight(float factor)
{
setLineSpacing(factor - 1);
}
//---------------------------------------------------------------------------- //----------------------------------------------------------------------------
void Text::TextOSG::setFill(const std::string& fill) void Text::TextOSG::setFill(const std::string& fill)
{ {
@@ -282,6 +289,7 @@ namespace canvas
addStyle("character-aspect-ratio", addStyle("character-aspect-ratio",
"numeric", "numeric",
&TextOSG::setCharacterAspect, text); &TextOSG::setCharacterAspect, text);
addStyle("line-height", "numeric", &TextOSG::setLineHeight, text);
addStyle("font-resolution", "numeric", &TextOSG::setFontResolution, text); addStyle("font-resolution", "numeric", &TextOSG::setFontResolution, text);
addStyle("padding", "numeric", &TextOSG::setBoundingBoxMargin, text); addStyle("padding", "numeric", &TextOSG::setBoundingBoxMargin, text);
// TEXT = 1 default // TEXT = 1 default