update Xcode project, fix some warnings, update android icons, ignore unrecognized files in the doc browser

This commit is contained in:
2018-09-22 23:21:39 +02:00
parent 3191730c31
commit c6f8bf7b9f
25 changed files with 33 additions and 22 deletions

View File

@@ -157,7 +157,7 @@ kEventResult Node::on_event(Event* e)
break;
GestureEvent* ge = static_cast<GestureEvent*>(e);
bool inside = point_in_rect(ge->m_pos, m_clip);
bool inside_old = m_mouse_inside;
//bool inside_old = m_mouse_inside;
m_mouse_inside = inside;
if ((inside || m_mouse_captured) && handle_event(e) == kEventResult::Consumed)
return kEventResult::Consumed;
@@ -208,7 +208,9 @@ void Node::removed(Node* parent)
const Node* Node::init_template(const char* id)
{
const auto& m_template = static_cast<Node*>((*m_manager)[const_hash(id)]->m_children[0].get());
auto hid = const_hash(id);
Node* top = m_manager->get(hid);
Node* m_template = static_cast<Node*>(top->m_children[0].get());
for (auto& c : m_template->m_children)
{
auto node = c->clone();