diff --git a/src/node_panel_stroke.cpp b/src/node_panel_stroke.cpp index 4fefc74..a7cd976 100644 --- a/src/node_panel_stroke.cpp +++ b/src/node_panel_stroke.cpp @@ -282,7 +282,7 @@ void NodePanelStroke::init_controls() tick->SetSize(16, 32); tick->SetPosition(pos.x, pos.y + (m_preset_button->m_size.y - 32) * 0.5f); tick->set_image("data/ui/popup-tick.png"); - float hh = m_presets_popup->m_container->m_children.size() > 10 ? App::I.height * .75f : 400.f; + float hh = m_presets_popup->m_container->m_children.size() > 10 ? App::I.height / App::I.zoom * .75f : 400.f; m_presets_popup->SetSize(300, glm::max(hh, 400.f)); root()->update(); if ((pos.y + m_presets_popup->m_size.y) > screen.y) diff --git a/src/node_stroke_preview.cpp b/src/node_stroke_preview.cpp index bd20719..430117e 100644 --- a/src/node_stroke_preview.cpp +++ b/src/node_stroke_preview.cpp @@ -246,11 +246,8 @@ void NodeStrokePreview::draw_stroke() const auto& b = m_brush; - float w = m_size.x * App::I.zoom; - float h = m_size.y * App::I.zoom; - m_stroke.m_filter_points = false; - m_stroke.m_max_size = h * .75f; + m_stroke.m_max_size = m_size.y * .75f; m_stroke.m_camera.fov = Canvas::I->m_cam_fov; m_stroke.m_camera.rot = Canvas::I->m_cam_rot; m_stroke.reset(true); @@ -289,6 +286,8 @@ void NodeStrokePreview::draw_stroke() float pad = glm::max(glm::min(m_stroke.m_max_size, m_brush->m_tip_size) / 2.f, 10.f); if (b->m_tip_size_pressure) pad = 10.f; + float w = m_size.x * App::I.zoom; + float h = m_size.y * App::I.zoom; std::vector kp = { { pad, h / 2.f }, { w / 2.f, 0 },