From e7f734c824becb0fcaadd70646ad159fb5b8ec9c Mon Sep 17 00:00:00 2001
From: omigamedev <omarator@gmail.com>
Date: Sun, 3 Mar 2019 08:24:45 +0100
Subject: [PATCH] fix brush tip and pattern import

---
 data/layout.xml          |  2 ++
 src/node_panel_brush.cpp | 11 ++++++-----
 src/node_panel_brush.h   |  3 ++-
 3 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/data/layout.xml b/data/layout.xml
index 8be3178..32d7518 100644
--- a/data/layout.xml
+++ b/data/layout.xml
@@ -109,9 +109,11 @@
         <button-custom id="btn-down" thickness="1" color="0 0" border-color=".0" shrink="1" margin="0 2 0 0">
           <icon width="30" icon="bullet_arrow_down"/>
         </button-custom>
+        <!--
         <button-custom id="btn-save" thickness="1" color="0 0" border-color=".0" shrink="1" margin="0 2 0 0">
           <icon width="30" icon="bullet_disk"/>
         </button-custom>
+        -->
         <node grow="1"></node>
         <button-custom id="btn-remove" thickness="1" color="0 0" border-color=".0" shrink="1" margin="0 10 0 0">
           <icon width="30" icon="bin_closed"/>
diff --git a/src/node_panel_brush.cpp b/src/node_panel_brush.cpp
index 7dcae68..9ac3b69 100644
--- a/src/node_panel_brush.cpp
+++ b/src/node_panel_brush.cpp
@@ -66,13 +66,14 @@ void NodePanelBrush::init()
                 std::string path_high = App::I.data_path + "/" + m_dir_name + "/" + name + ".png";
                 std::string path_thumb = App::I.data_path + "/" + m_dir_name + "/thumbs/" + name + ".png";
 
-                img = img.resize_squared(glm::u8vec4(255));
-                //img.gayscale_alpha();
+                //img = img.resize_squared(glm::u8vec4(255));
+                if (m_dir_name == "brushes")
+                    img.gayscale_alpha();
 
-                auto thumb = img.resize(64, 64);
+                auto thumb = img.resize(64, 64).resize_squared(glm::u8vec4(255));
                 thumb.save(path_thumb);
-                auto po2 = img.resize_power2();
-                po2.save(path_high);
+                //auto po2 = img.resize_power2();
+                img.save(path_high);
 
                 async_start();
                 NodeButtonBrush* brush = new NodeButtonBrush;
diff --git a/src/node_panel_brush.h b/src/node_panel_brush.h
index 9d92bbe..a3a4d6f 100644
--- a/src/node_panel_brush.h
+++ b/src/node_panel_brush.h
@@ -35,7 +35,8 @@ class NodePanelBrush : public Node
     NodeButtonCustom* m_btn_remove;
     struct header_t {
         char magic[5]{ 'P', 'P', 'B', 'R', 0 };
-        uint16_t version = 0;
+        uint16_t version = 1;
+        uint16_t build = g_version_build;
         uint16_t brushes = 0;
         uint16_t deleted = 0;
     };