add scrollbar, improve presets, other small fixes

This commit is contained in:
2019-01-27 17:19:06 +01:00
parent 6f3465392b
commit 99c06803ae
14 changed files with 94 additions and 20 deletions

View File

@@ -694,8 +694,8 @@ void Node::update_internal(const glm::vec2& origin, const glm::mat4& proj)
float pl = YGNodeLayoutGetPadding(parent->y_node, YGEdgeLeft);
glm::vec2 off_p(pl, pt);
glm::vec2 off_s(pr, pb);
glm::vec4 pclip = { xy(parent->m_clip) + off_p, zw(parent->m_clip) - off_s - off_p};
m_clip_uncut = glm::vec4(m_pos, m_size);
glm::vec4 pclip = { xy(parent->m_clip) + off_p, zw(parent->m_clip) - (off_s + off_p)};
m_clip_uncut = glm::vec4(m_pos - glm::vec2(1), m_size + glm::vec2(2));
m_clip = rect_intersection(m_clip_uncut, parent->m_clip);
}
else