Cayleb-Ordo/0ad
1
0
Fork 0
forked from 0ad/0ad
Code Pull Requests Activity

CInput textcolor

Browse Source 
This was SVN commit r1602.
This commit is contained in:
Ykkrosh 2004-12-31 12:20:22 +00:00
parent 855e1a7f81
commit 1c2acfed8c
3 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
binaries/data/mods/official/gui/test/2_mainmenu.xml
View File

@ -20,7 +20,7 @@
<object type="image" name="pregame-mainmenu-background-image" sprite="pregame-mainmenu-background" size="0 0 100% 100%" z="100" hidden="false" ghost="true"/>
<object type="button" name="pregame-mainmenu-sp-button" sprite-over="pregame-mainmenu-spbt" size="52.9296875% 23.95833333% 67.578125% 42.317708333%" z="101" hidden="false"
tooltip-style="pregame-mainmenu-tooltip" tooltip="Want to move some Dudes around or test something ? Click here to start a new game on the default map.">
tooltip-style="pregame-mainmenu-tooltip" tooltip="Want to move some Dudes around or test something? Click here to start a new game on the default map.">
<action on="Press"><![CDATA[
GUIObjectUnhide("pregame_subwindow_bkg");
GUIObjectUnhide("pregame_sp_mapsel");
@ -193,7 +193,7 @@
Map Name:
</object>
<object type="input" name="pregame_sp_mapname" sprite="only-black" absolute="false" size="130 90 290 110" textcolor="0 0 0">
<object type="input" name="pregame_sp_mapname" sprite="only-black" absolute="false" size="130 90 290 110" textcolor="255 255 255">
test01.pmp
</object>

2
source/gui/CGUI.cpp
View File

@ -883,7 +883,7 @@ void CGUI::DrawText(SGUIText &Text, const CColor &DefaultColor,
// TODO Gee: (2004-09-04) Why are font corrupted if inputted float value?
glTranslatef((GLfloat)int(pos.x+it->m_Pos.x), (GLfloat)int(pos.y+it->m_Pos.y), z);
glColor4f(color.r, color.g, color.b, color.a);
glColor4fv(color.FloatArray());
glwprintf(L"%ls", it->m_String.c_str()); // "%ls" is necessary in case m_String contains % symbols
glPopMatrix();

4
source/gui/CInput.cpp
View File

@ -356,7 +356,7 @@ void CInput::Draw()
scroll = GetScrollBar(0).GetPos();
}
CColor color;
CColor color (1.f, 1.f, 1.f, 1.f);
GUI<CColor>::GetSetting(this, "textcolor", color);
glEnable(GL_TEXTURE_2D);
@ -381,7 +381,7 @@ void CInput::Draw()
float ls = (float)font.GetLineSpacing();
glTranslatef((GLfloat)int(m_CachedActualSize.left), (GLfloat)int(m_CachedActualSize.top+h), bz);
glColor4f(1.f, 1.f, 1.f, 1.f);
glColor4fv(color.FloatArray());
float buffered_y=0.f;