Carltonus/0ad
1
0
Fork 0
forked from 0ad/0ad
Code Pull Requests Activity

Variable fonts in the GUI

Browse Source 
This was SVN commit r871.
This commit is contained in:
Ykkrosh 2004-07-31 19:52:15 +00:00
parent 4577ad00dc
commit 1bbb35b204
1 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
source/gui/CText.cpp
View File

@ -21,6 +21,7 @@ using namespace std;
CText::CText()
{
AddSetting(GUIST_CGUIString, "caption");
AddSetting(GUIST_CStr, "font");
AddSetting(GUIST_bool, "scrollbar");
AddSetting(GUIST_CStr, "scrollbar-style");
AddSetting(GUIST_CStr, "sprite");
@ -51,7 +52,12 @@ void CText::SetupText()
assert(m_GeneratedTexts.size()>=1);
CColor color;
CStr font;
if (GUI<CStr>::GetSetting(this, "font", font) != PS_OK || font.Length()==0)
// Use the default if none is specified
font = "palatino12";
CGUIString caption;
bool scrollbar;
GUI<CColor>::GetSetting(this, "textcolor", color);
@ -63,7 +69,7 @@ void CText::SetupText()
if (scrollbar && GetScrollBar(0).GetStyle())
width -= GetScrollBar(0).GetStyle()->m_Width;
*m_GeneratedTexts[0] = GetGUI()->GenerateText(caption, /*color,*/ CStr("palatino12"), width, 4);
*m_GeneratedTexts[0] = GetGUI()->GenerateText(caption, /*color,*/ font, width, 4);
// Setup scrollbar
if (scrollbar)