From 0c71feedf7bff0069451cb8b267b10f2ae241d06 Mon Sep 17 00:00:00 2001
From: omigamedev <omarator@gmail.com>
Date: Tue, 12 Mar 2019 14:52:58 +0100
Subject: [PATCH] remove unused test code, fix presets panel height on high dp,
 update quick panel on alt+rdrag resize

---
 src/canvas_modes.cpp     |  3 +--
 src/main.cpp             | 21 ---------------------
 src/node_panel_quick.cpp |  2 +-
 3 files changed, 2 insertions(+), 24 deletions(-)

diff --git a/src/canvas_modes.cpp b/src/canvas_modes.cpp
index 0feacd2..d8a6a68 100644
--- a/src/canvas_modes.cpp
+++ b/src/canvas_modes.cpp
@@ -190,8 +190,7 @@ void CanvasModePen::on_MouseEvent(MouseEvent* me, glm::vec2& loc)
                 auto diff = m_cur_pos - m_size_pos_start;
                 auto curve = App::I.stroke->m_curves[App::I.stroke->m_tip_size];
                 Canvas::I->m_current_brush->m_tip_size = glm::max(curve.to_value(m_size_value_start + diff.x * 0.001f), 0.001f);
-                if (App::I.stroke)
-                    App::I.stroke->update_controls();
+                App::I.brush_update();
             }
             m_cur_pos = loc;
             break;
diff --git a/src/main.cpp b/src/main.cpp
index fc06e9a..831ac56 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -448,27 +448,6 @@ void init_vk_map()
 
 int main(int argc, char** argv)
 {
-    ABR abr;
-    abr.open("D:\\assets\\ABR\\coldyn.abr");
-
-    BinaryStreamWriter sw;
-    abr.m_presets[0]->write(sw);
-
-    std::vector<uint8_t> data;
-    for (int i = 0; i < 10; i++)
-        data.resize(data.size() + rand() % 10, i % 2);
-    BinaryStreamWriter w;
-    w.wrle(data);
-    BinaryStreamReader r;
-    r.init(w.m_data.data(), w.m_data.size());
-    auto decoded = r.rrle(w.m_data.size());
-
-    assert(data.size() == decoded.size());
-    for (int i = 0; i < data.size(); i++)
-    {
-        assert(data[i] == decoded[i]);
-    }
-
     WNDCLASS wc;
     PIXELFORMATDESCRIPTOR pfd;
 
diff --git a/src/node_panel_quick.cpp b/src/node_panel_quick.cpp
index 0c7e9a9..3f2b3c5 100644
--- a/src/node_panel_quick.cpp
+++ b/src/node_panel_quick.cpp
@@ -139,7 +139,7 @@ void NodePanelQuick::handle_button_brush_click(Node* button)
     tick->SetSize(16, 32);
     tick->SetPosition(pos.x, pos.y + (button->m_size.y - 32) * 0.5f);
     tick->set_image("data/ui/popup-tick.png");
-    float hh = App::I.presets->m_container->m_children.size() > 10 ? App::I.height - 90.f * App::I.zoom : 400.f;
+    float hh = App::I.presets->m_container->m_children.size() > 10 ? (App::I.height / App::I.zoom - 90.f) : 400.f;
     App::I.presets->SetHeight(glm::max(hh, 400.f));
     root()->update();
     if ((pos.y + App::I.presets->m_size.y) > screen.y)