AxioDL/metaforce
2
0
Fork 0
mirror of https://github.com/AxioDL/metaforce.git synced 2025-12-10 16:27:43 +00:00
Code Issues Projects Releases Wiki Activity

Text alignment and Text Button

Browse Source
This commit is contained in:
Jack Andersen
2015-12-13 11:00:30 -10:00
parent 72bd17890d
commit 2efa64b7b0
8 changed files with 278 additions and 94 deletions
Download Patch File Download Diff File Expand all files Collapse all files

238
specter/lib/Button.cpp
View File

@@ -12,8 +12,14 @@ void Button::Resources::init(boo::IGraphicsDataFactory* factory, const ThemeData
}
Button::Button(ViewResources& res, View& parentView,
IButtonBinding* controlBinding, const std::string& text)
: Control(res, parentView, controlBinding), m_textStr(text)
IButtonBinding* controlBinding, const std::string& text,
Style style)
: Button(res, parentView, controlBinding, text, res.themeData().uiText(), style) {}
Button::Button(ViewResources& res, View& parentView,
IButtonBinding* controlBinding, const std::string& text,
const Zeus::CColor& textColor, Style style)
: Control(res, parentView, controlBinding), m_style(style), m_textColor(textColor), m_textStr(text)
{
m_bBlockBuf = res.m_factory->newDynamicBuffer(boo::BufferUse::Uniform, sizeof(ViewBlock), 1);
m_bVertsBuf = res.m_factory->newDynamicBuffer(boo::BufferUse::Vertex, sizeof(SolidShaderVert), 28);
@@ -39,105 +45,185 @@ Button::Button(ViewResources& res, View& parentView,
m_bVertsBuf, nullptr,
nullptr, 1, bufs, 0, nullptr);
}
commitResources(res);
if (style == Style::Block)
{
m_verts[0].m_color = res.themeData().button1Inactive();
m_verts[1].m_color = res.themeData().button2Inactive();
m_verts[2].m_color = res.themeData().button1Inactive();
m_verts[3].m_color = res.themeData().button2Inactive();
m_verts[4].m_color = res.themeData().button2Inactive();
for (int i=5 ; i<28 ; ++i)
m_verts[i].m_color = res.themeData().button2Inactive();
m_bVertsBuf->load(m_verts, sizeof(SolidShaderVert) * 28);
}
else
{
for (int i=0 ; i<4 ; ++i)
m_verts[i].m_color = Zeus::CColor::skClear;
m_bVertsBuf->load(m_verts, sizeof(SolidShaderVert) * 4);
}
m_text.reset(new TextView(res, *this, res.m_mainFont));
setText(m_textStr);
m_verts[0].m_color = res.themeData().button1Inactive();
m_verts[1].m_color = res.themeData().button2Inactive();
m_verts[2].m_color = res.themeData().button1Inactive();
m_verts[3].m_color = res.themeData().button2Inactive();
m_verts[4].m_color = res.themeData().button2Inactive();
for (int i=5 ; i<28 ; ++i)
m_verts[i].m_color = res.themeData().button2Inactive();
m_bVertsBuf->load(m_verts, sizeof(SolidShaderVert) * 28);
}
void Button::setText(const std::string& text)
void Button::setText(const std::string &text)
{
setText(text, m_textColor);
}
void Button::setText(const std::string& text, const Zeus::CColor& textColor)
{
m_textStr = text;
m_textColor = textColor;
m_text->typesetGlyphs(text, rootView().themeData().uiText());
m_text->typesetGlyphs(text, textColor);
float pf = rootView().viewRes().pixelFactor();
float width = m_text->nominalWidth() + 10 * pf;
float height = 20 * pf;
m_verts[0].m_pos.assign(1, height+1, 0);
m_verts[1].m_pos.assign(1, 1, 0);
m_verts[2].m_pos.assign(width+1, height+1, 0);
m_verts[3].m_pos.assign(width+1, 1, 0);
m_verts[4].m_pos.assign(width+1, 1, 0);
float width, height;
m_verts[5].m_pos.assign(1, height+1, 0);
m_verts[6].m_pos.assign(1, height+1, 0);
m_verts[7].m_pos.assign(0, height+1, 0);
m_verts[8].m_pos.assign(1, 1, 0);
m_verts[9].m_pos.assign(0, 1, 0);
m_verts[10].m_pos.assign(0, 1, 0);
if (m_style == Style::Block)
{
width = m_text->nominalWidth() + 12 * pf;
height = 20 * pf;
m_verts[0].m_pos.assign(1, height+1, 0);
m_verts[1].m_pos.assign(1, 1, 0);
m_verts[2].m_pos.assign(width+1, height+1, 0);
m_verts[3].m_pos.assign(width+1, 1, 0);
m_verts[4].m_pos.assign(width+1, 1, 0);
m_verts[11].m_pos.assign(width+2, height+1, 0);
m_verts[12].m_pos.assign(width+2, height+1, 0);
m_verts[13].m_pos.assign(width+1, height+1, 0);
m_verts[14].m_pos.assign(width+2, 1, 0);
m_verts[15].m_pos.assign(width+1, 1, 0);
m_verts[16].m_pos.assign(width+1, 1, 0);
m_verts[5].m_pos.assign(1, height+1, 0);
m_verts[6].m_pos.assign(1, height+1, 0);
m_verts[7].m_pos.assign(0, height+1, 0);
m_verts[8].m_pos.assign(1, 1, 0);
m_verts[9].m_pos.assign(0, 1, 0);
m_verts[10].m_pos.assign(0, 1, 0);
m_verts[17].m_pos.assign(1, height+2, 0);
m_verts[18].m_pos.assign(1, height+2, 0);
m_verts[19].m_pos.assign(1, height+1, 0);
m_verts[20].m_pos.assign(width+1, height+2, 0);
m_verts[21].m_pos.assign(width+1, height+1, 0);
m_verts[22].m_pos.assign(width+1, height+1, 0);
m_verts[11].m_pos.assign(width+2, height+1, 0);
m_verts[12].m_pos.assign(width+2, height+1, 0);
m_verts[13].m_pos.assign(width+1, height+1, 0);
m_verts[14].m_pos.assign(width+2, 1, 0);
m_verts[15].m_pos.assign(width+1, 1, 0);
m_verts[16].m_pos.assign(width+1, 1, 0);
m_verts[23].m_pos.assign(1, 1, 0);
m_verts[24].m_pos.assign(1, 1, 0);
m_verts[25].m_pos.assign(1, 0, 0);
m_verts[26].m_pos.assign(width+1, 1, 0);
m_verts[27].m_pos.assign(width+1, 0, 0);
m_verts[17].m_pos.assign(1, height+2, 0);
m_verts[18].m_pos.assign(1, height+2, 0);
m_verts[19].m_pos.assign(1, height+1, 0);
m_verts[20].m_pos.assign(width+1, height+2, 0);
m_verts[21].m_pos.assign(width+1, height+1, 0);
m_verts[22].m_pos.assign(width+1, height+1, 0);
m_bVertsBuf->load(m_verts, sizeof(SolidShaderVert) * 28);
m_nomWidth = width + 2;
m_verts[23].m_pos.assign(1, 1, 0);
m_verts[24].m_pos.assign(1, 1, 0);
m_verts[25].m_pos.assign(1, 0, 0);
m_verts[26].m_pos.assign(width+1, 1, 0);
m_verts[27].m_pos.assign(width+1, 0, 0);
m_bVertsBuf->load(m_verts, sizeof(SolidShaderVert) * 28);
}
else
{
width = m_text->nominalWidth();
height = 10 * pf;
m_verts[0].m_pos.assign(1*pf, -1*pf, 0);
m_verts[1].m_pos.assign(1*pf, -2*pf, 0);
m_verts[2].m_pos.assign(width, -1*pf, 0);
m_verts[3].m_pos.assign(width, -2*pf, 0);
m_bVertsBuf->load(m_verts, sizeof(SolidShaderVert) * 4);
}
m_nomWidth = width;
m_nomHeight = height;
}
void Button::colorGlyphs(const Zeus::CColor& newColor)
{
m_textColor = newColor;
m_text->colorGlyphs(newColor);
}
void Button::setInactive()
{
m_verts[0].m_color = rootView().themeData().button1Inactive();
m_verts[1].m_color = rootView().themeData().button2Inactive();
m_verts[2].m_color = rootView().themeData().button1Inactive();
m_verts[3].m_color = rootView().themeData().button2Inactive();
m_verts[4].m_color = rootView().themeData().button2Inactive();
m_bVertsBuf->load(m_verts, sizeof(SolidShaderVert) * 28);
if (m_style == Style::Block)
{
m_verts[0].m_color = rootView().themeData().button1Inactive();
m_verts[1].m_color = rootView().themeData().button2Inactive();
m_verts[2].m_color = rootView().themeData().button1Inactive();
m_verts[3].m_color = rootView().themeData().button2Inactive();
m_verts[4].m_color = rootView().themeData().button2Inactive();
m_bVertsBuf->load(m_verts, sizeof(SolidShaderVert) * 28);
}
else
{
for (int i=0 ; i<4 ; ++i)
m_verts[i].m_color = Zeus::CColor::skClear;
m_bVertsBuf->load(m_verts, sizeof(SolidShaderVert) * 4);
m_text->colorGlyphs(m_textColor);
}
}
void Button::setHover()
{
m_verts[0].m_color = rootView().themeData().button1Hover();
m_verts[1].m_color = rootView().themeData().button2Hover();
m_verts[2].m_color = rootView().themeData().button1Hover();
m_verts[3].m_color = rootView().themeData().button2Hover();
m_verts[4].m_color = rootView().themeData().button2Hover();
m_bVertsBuf->load(m_verts, sizeof(SolidShaderVert) * 28);
if (m_style == Style::Block)
{
m_verts[0].m_color = rootView().themeData().button1Hover();
m_verts[1].m_color = rootView().themeData().button2Hover();
m_verts[2].m_color = rootView().themeData().button1Hover();
m_verts[3].m_color = rootView().themeData().button2Hover();
m_verts[4].m_color = rootView().themeData().button2Hover();
m_bVertsBuf->load(m_verts, sizeof(SolidShaderVert) * 28);
}
else
{
for (int i=0 ; i<4 ; ++i)
m_verts[i].m_color = m_textColor;
m_bVertsBuf->load(m_verts, sizeof(SolidShaderVert) * 4);
m_text->colorGlyphs(m_textColor);
}
}
void Button::setPressed()
{
m_verts[0].m_color = rootView().themeData().button1Press();
m_verts[1].m_color = rootView().themeData().button2Press();
m_verts[2].m_color = rootView().themeData().button1Press();
m_verts[3].m_color = rootView().themeData().button2Press();
m_verts[4].m_color = rootView().themeData().button2Press();
m_bVertsBuf->load(m_verts, sizeof(SolidShaderVert) * 28);
if (m_style == Style::Block)
{
m_verts[0].m_color = rootView().themeData().button1Press();
m_verts[1].m_color = rootView().themeData().button2Press();
m_verts[2].m_color = rootView().themeData().button1Press();
m_verts[3].m_color = rootView().themeData().button2Press();
m_verts[4].m_color = rootView().themeData().button2Press();
m_bVertsBuf->load(m_verts, sizeof(SolidShaderVert) * 28);
}
else
{
for (int i=0 ; i<4 ; ++i)
m_verts[i].m_color = m_textColor;
m_bVertsBuf->load(m_verts, sizeof(SolidShaderVert) * 4);
m_text->colorGlyphs(m_textColor);
}
}
void Button::setDisabled()
{
m_verts[0].m_color = rootView().themeData().button1Disabled();
m_verts[1].m_color = rootView().themeData().button2Disabled();
m_verts[2].m_color = rootView().themeData().button1Disabled();
m_verts[3].m_color = rootView().themeData().button2Disabled();
m_verts[4].m_color = rootView().themeData().button2Disabled();
m_bVertsBuf->load(m_verts, sizeof(SolidShaderVert) * 28);
if (m_style == Style::Block)
{
m_verts[0].m_color = rootView().themeData().button1Disabled();
m_verts[1].m_color = rootView().themeData().button2Disabled();
m_verts[2].m_color = rootView().themeData().button1Disabled();
m_verts[3].m_color = rootView().themeData().button2Disabled();
m_verts[4].m_color = rootView().themeData().button2Disabled();
m_bVertsBuf->load(m_verts, sizeof(SolidShaderVert) * 28);
}
else
{
for (int i=0 ; i<4 ; ++i)
m_verts[i].m_color = Zeus::CColor::skClear;
m_bVertsBuf->load(m_verts, sizeof(SolidShaderVert) * 4);
Zeus::CColor dimText = m_textColor;
dimText[3] *= 0.5;
m_text->colorGlyphs(dimText);
}
}
void Button::mouseDown(const boo::SWindowCoord& coord, boo::EMouseButton button, boo::EModifierKey mod)
@@ -184,11 +270,14 @@ void Button::resized(const boo::SWindowRect& root, const boo::SWindowRect& sub)
{
View::resized(root, sub);
boo::SWindowRect textRect = sub;
float pf = rootView().viewRes().pixelFactor();
m_bBlock.setViewRect(root, sub);
m_bBlockBuf->load(&m_bBlock, sizeof(ViewBlock));
float pf = rootView().viewRes().pixelFactor();
textRect.location[0] += 5 * pf;
textRect.location[1] += 8 * pf;
if (m_style == Style::Block)
{
textRect.location[0] += 5 * pf;
textRect.location[1] += 8 * pf;
}
m_text->resized(root, textRect);
}
@@ -197,7 +286,10 @@ void Button::draw(boo::IGraphicsCommandQueue* gfxQ)
View::draw(gfxQ);
gfxQ->setShaderDataBinding(m_bShaderBinding);
gfxQ->setDrawPrimitive(boo::Primitive::TriStrips);
gfxQ->draw(0, 28);
if (m_style == Style::Block)
gfxQ->draw(0, 28);
else
gfxQ->draw(0, 4);
m_text->draw(gfxQ);
}