AxioDL
/
metaforce
mirror of https://github.com/AxioDL/metaforce.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

Menu activation implementation

This commit is contained in:
Jack Andersen 2016-01-15 17:57:11 -10:00
parent 8697291405
commit ae5b478a88
3 changed files with 18 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
specter/include/Specter/Menu.hpp
View File

@ -14,7 +14,7 @@ struct IMenuNode
virtual const std::string* text() const {return nullptr;} virtual const std::string* text() const {return nullptr;}
virtual size_t subNodeCount() const {return 0;} virtual size_t subNodeCount() const {return 0;}
virtual IMenuNode* subNode(size_t idx) {return nullptr;} virtual IMenuNode* subNode(size_t idx) {return nullptr;}
virtual void activated() {} virtual void activated(const boo::SWindowCoord& coord) {}
}; };
class Menu : public View class Menu : public View
@ -28,7 +28,7 @@ class Menu : public View
SolidShaderVert m_verts[8]; SolidShaderVert m_verts[8];
VertexBufferBinding m_vertsBinding; VertexBufferBinding m_vertsBinding;
void setVerts(int width, int height); void setVerts(int width, int height, float pf);
struct ContentView : View struct ContentView : View
{ {
@ -67,7 +67,8 @@ class Menu : public View
Menu& m_menu; Menu& m_menu;
std::unique_ptr<TextView> m_textView; std::unique_ptr<TextView> m_textView;
size_t m_idx; size_t m_idx;
ItemView(ViewResources& res, Menu& menu, const std::string& text, size_t idx); IMenuNode& m_node;
ItemView(ViewResources& res, Menu& menu, const std::string& text, size_t idx, IMenuNode& node);
void mouseDown(const boo::SWindowCoord&, boo::EMouseButton, boo::EModifierKey); void mouseDown(const boo::SWindowCoord&, boo::EMouseButton, boo::EModifierKey);
void mouseUp(const boo::SWindowCoord&, boo::EMouseButton, boo::EModifierKey); void mouseUp(const boo::SWindowCoord&, boo::EMouseButton, boo::EModifierKey);

3
specter/lib/Button.cpp
View File

@ -180,6 +180,9 @@ void Button::colorGlyphs(const Zeus::CColor& newColor)
{ {
m_textColor = newColor; m_textColor = newColor;
m_text->colorGlyphs(newColor); m_text->colorGlyphs(newColor);
for (int i=28 ; i<31 ; ++i)
m_verts[i].m_color = newColor;
m_vertsBinding.load(m_verts, sizeof(m_verts));
} }
void Button::ButtonTarget::setInactive() void Button::ButtonTarget::setInactive()

22
specter/lib/Menu.cpp
View File

@ -56,7 +56,7 @@ void Menu::reset(IMenuNode* rootNode)
if (nodeText) if (nodeText)
{ {
item.m_view.reset(new ItemView(res, *this, *nodeText, i)); item.m_view.reset(new ItemView(res, *this, *nodeText, i, *node));
m_cWidth = std::max(m_cWidth, int(item.m_view->m_textView->nominalWidth() + 10*pf)); m_cWidth = std::max(m_cWidth, int(item.m_view->m_textView->nominalWidth() + 10*pf));
} }
@ -88,25 +88,25 @@ Menu::ContentView::ContentView(ViewResources& res, Menu& menu)
m_hlVerts[3].m_color = res.themeData().button2Hover(); m_hlVerts[3].m_color = res.themeData().button2Hover();
} }
Menu::ItemView::ItemView(ViewResources& res, Menu& menu, const std::string& text, size_t idx) Menu::ItemView::ItemView(ViewResources& res, Menu& menu, const std::string& text, size_t idx, IMenuNode& node)
: View(res, menu), m_menu(menu), m_idx(idx) : View(res, menu), m_menu(menu), m_idx(idx), m_node(node)
{ {
commitResources(res); commitResources(res);
m_textView.reset(new Specter::TextView(res, *this, res.m_mainFont)); m_textView.reset(new Specter::TextView(res, *this, res.m_mainFont));
m_textView->typesetGlyphs(text, res.themeData().uiText()); m_textView->typesetGlyphs(text, res.themeData().uiText());
} }
void Menu::setVerts(int width, int height) void Menu::setVerts(int width, int height, float pf)
{ {
m_verts[0].m_pos.assign(0, height-m_cTop, 0); m_verts[0].m_pos.assign(0, height-m_cTop-pf, 0);
m_verts[1].m_pos.assign(0, 0, 0); m_verts[1].m_pos.assign(0, 0, 0);
m_verts[2].m_pos.assign(width, height-m_cTop, 0); m_verts[2].m_pos.assign(width, height-m_cTop-pf, 0);
m_verts[3].m_pos.assign(width, 0, 0); m_verts[3].m_pos.assign(width, 0, 0);
m_verts[4].m_pos.assign(0, height, 0); m_verts[4].m_pos.assign(0, height, 0);
m_verts[5].m_pos.assign(0, height-m_cTop, 0); m_verts[5].m_pos.assign(0, height-m_cTop+pf, 0);
m_verts[6].m_pos.assign(width, height, 0); m_verts[6].m_pos.assign(width, height, 0);
m_verts[7].m_pos.assign(width, height-m_cTop, 0); m_verts[7].m_pos.assign(width, height-m_cTop+pf, 0);
m_vertsBinding.load(m_verts, sizeof(m_verts)); m_vertsBinding.load(m_verts, sizeof(m_verts));
} }
@ -152,7 +152,6 @@ void Menu::ContentView::mouseDown(const boo::SWindowCoord& coord, boo::EMouseBut
void Menu::ItemView::mouseDown(const boo::SWindowCoord& coord, boo::EMouseButton button, boo::EModifierKey mod) void Menu::ItemView::mouseDown(const boo::SWindowCoord& coord, boo::EMouseButton button, boo::EModifierKey mod)
{ {
} }
void Menu::mouseUp(const boo::SWindowCoord& coord, boo::EMouseButton button, boo::EModifierKey mod) void Menu::mouseUp(const boo::SWindowCoord& coord, boo::EMouseButton button, boo::EModifierKey mod)
@ -168,7 +167,8 @@ void Menu::ContentView::mouseUp(const boo::SWindowCoord& coord, boo::EMouseButto
void Menu::ItemView::mouseUp(const boo::SWindowCoord& coord, boo::EMouseButton button, boo::EModifierKey mod) void Menu::ItemView::mouseUp(const boo::SWindowCoord& coord, boo::EMouseButton button, boo::EModifierKey mod)
{ {
if (m_menu.m_content->m_highlightedItem == m_idx)
m_node.activated(coord);
} }
void Menu::mouseMove(const boo::SWindowCoord& coord) void Menu::mouseMove(const boo::SWindowCoord& coord)
@ -231,7 +231,7 @@ void Menu::resized(const boo::SWindowRect& root, const boo::SWindowRect& sub)
View::resized(root, rect); View::resized(root, rect);
m_scroll.m_view->resized(root, rect); m_scroll.m_view->resized(root, rect);
setVerts(rect.size[0], rect.size[1]); setVerts(rect.size[0], rect.size[1], pf);
rect.location[0] += 5*pf; rect.location[0] += 5*pf;
rect.location[1] += rect.size[1] - (ROW_HEIGHT + ITEM_MARGIN - 5)*pf; rect.location[1] += rect.size[1] - (ROW_HEIGHT + ITEM_MARGIN - 5)*pf;