Added: Monospace font options

This commit is contained in:
Nimetu 2016-07-24 16:07:18 +03:00
parent 976b5d5689
commit 74a4e107b6
7 changed files with 14 additions and 0 deletions

View file

@ -442,6 +442,7 @@ namespace NLGUI
OptionTimeoutMessages, OptionTimeoutMessages,
OptionTimeoutContext, OptionTimeoutContext,
OptionTimeoutContextHtml, OptionTimeoutContextHtml,
OptionMonospaceFont,
NumSystemOptions NumSystemOptions
}; };

View file

@ -3170,6 +3170,7 @@ namespace NLGUI
_SystemOptions[OptionTimeoutMessages]= opt->getValue("messages_timeout"); _SystemOptions[OptionTimeoutMessages]= opt->getValue("messages_timeout");
_SystemOptions[OptionTimeoutContext]= opt->getValue("context_timeout"); _SystemOptions[OptionTimeoutContext]= opt->getValue("context_timeout");
_SystemOptions[OptionTimeoutContextHtml]= opt->getValue("context_html_timeout"); _SystemOptions[OptionTimeoutContextHtml]= opt->getValue("context_html_timeout");
_SystemOptions[OptionMonospaceFont]= opt->getValue("monospace_font");
} }
} }

View file

@ -1916,6 +1916,8 @@ This MUST follow the Enum MISSION_DESC::TIconId
value="basic.ttf" /> --> value="basic.ttf" /> -->
<param name="font" <param name="font"
value="ryzom.ttf" /> value="ryzom.ttf" />
<param name="monospace_font"
value="ryzom_monospace.ttf" />
<param name="add_coef_font" <param name="add_coef_font"
value="1" /> value="1" />
<param name="mul_coef_anim" <param name="mul_coef_anim"

View file

@ -838,6 +838,8 @@ This MUST follow the Enum MISSION_DESC::TIconId
value="basic.ttf" /> --> value="basic.ttf" /> -->
<param name="font" <param name="font"
value="ryzom.ttf" /> value="ryzom.ttf" />
<param name="monospace_font"
value="ryzom_monospace.ttf" />
<param name="add_coef_font" <param name="add_coef_font"
value="3" /> value="3" />
<param name="mul_coef_anim" <param name="mul_coef_anim"

View file

@ -25,6 +25,8 @@
value="basic.ttf" /> --> value="basic.ttf" /> -->
<param name="font" <param name="font"
value="ryzom.ttf" /> value="ryzom.ttf" />
<param name="monospace_font"
value="ryzom_monospace.ttf" />
<param name="add_coef_font" <param name="add_coef_font"
value="0" /> value="0" />
<param name="mul_coef_anim" <param name="mul_coef_anim"

View file

@ -25,6 +25,8 @@
value="outgame.ttf" /> --> value="outgame.ttf" /> -->
<param name="font" <param name="font"
value="ryzom.ttf" /> value="ryzom.ttf" />
<param name="monospace_font"
value="ryzom_monospace.ttf" />
<param name="add_coef_font" <param name="add_coef_font"
value="3" /> value="3" />
<param name="mul_coef_anim" <param name="mul_coef_anim"

View file

@ -1572,6 +1572,10 @@ void CInterfaceManager::setupOptions()
if ((!sFont.empty()) && (Driver != NULL)) if ((!sFont.empty()) && (Driver != NULL))
resetTextContext(sFont.c_str(), true); resetTextContext(sFont.c_str(), true);
// Continue to parse the rest of the interface // Continue to parse the rest of the interface
sFont = wm->getSystemOption (CWidgetManager::OptionMonospaceFont).getValStr();
if ((!sFont.empty()) && (Driver != NULL))
CViewRenderer::registerFont("monospace", sFont);
} }
// ------------------------------------------------------------------------------------------------ // ------------------------------------------------------------------------------------------------