disable ssl in curl on android, implement interactive permission for android 23+

2018-09-30 23:51:15 +02:00
parent 74a901364d
commit daf3484426
9 changed files with 175 additions and 11 deletions
--- a/src/canvas_modes.cpp
+++ b/src/canvas_modes.cpp
@@ -162,7 +162,7 @@ void CanvasModePen::on_MouseEvent(MouseEvent* me, glm::vec2& loc)

 void CanvasModePen::on_Draw(const glm::mat4& ortho, const glm::mat4& proj, const glm::mat4& camera)
 {
-#ifndef __IOS__
+#if !(defined(__IOS__) || defined(__ANDROID__))
    //if (!m_dragging)
    {
        auto pos = m_resizing ? m_size_pos_start : m_cur_pos;