add download progress, improbable cloud browser, lock touch when pencil is down on iOS

This commit is contained in:
2018-01-04 00:02:28 +00:00
parent 01370642a1
commit 5feb3acb1d
10 changed files with 120 additions and 37 deletions

View File

@@ -93,7 +93,7 @@ kEventResult NodeSliderH::handle_event(Event* e)
auto pos = glm::clamp(((MouseEvent*)e)->m_pos - m_pos, { 0, 0 }, sz) * m_mask;
m_value = pos / glm::max({ 1, 1 }, sz);
if (on_value_changed)
on_value_changed(this, glm::length(m_value));
on_value_changed(this, glm::length(m_value * m_mask));
}
break;
case kEventType::MouseCancel:
@@ -103,7 +103,7 @@ kEventResult NodeSliderH::handle_event(Event* e)
m_value = m_old_value;
set_value(glm::length(m_value));
if (on_value_changed)
on_value_changed(this, glm::length(m_value));
on_value_changed(this, glm::length(m_value * m_mask));
}
dragging = false;
break;
@@ -143,6 +143,7 @@ void NodeSliderHue::init_controls()
glm::vec4 NodeSliderHue::get_hue()
{
m_color = glm::vec4(convert_hsv2rgb({ glm::length(m_value * m_mask), 1, 1 }), 1);
return m_color;
}