From d453e854b12447623ea1dd228170dbb6f571e94b Mon Sep 17 00:00:00 2001 From: omigamedev Date: Thu, 11 Jul 2019 11:13:43 +0200 Subject: [PATCH] update checkbox icons, clear redo actions when cleaning memory --- data/ui/check-v.png | Bin 0 -> 1437 bytes extra/ui/checkbox-icons.psd | Bin 94396 -> 91272 bytes src/action.cpp | 2 ++ src/node_checkbox.h | 2 +- 4 files changed, 3 insertions(+), 1 deletion(-) create mode 100644 data/ui/check-v.png diff --git a/data/ui/check-v.png b/data/ui/check-v.png new file mode 100644 index 0000000000000000000000000000000000000000..294b438c93c23372757576e99b8aeeeea37ff5de GIT binary patch literal 1437 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 diff --git a/src/action.cpp b/src/action.cpp index 8ba56bf..96eb334 100644 --- a/src/action.cpp +++ b/src/action.cpp @@ -52,6 +52,8 @@ void ActionManager::clear() { while (!I.m_actions.empty()) I.m_actions.pop(); + while (!I.m_redos.empty()) + I.m_redos.pop(); I.m_memory = 0; //LOG("History: %.2f KB", I.m_memory / 1024.f); App::I.update_memory_usage(I.m_memory); diff --git a/src/node_checkbox.h b/src/node_checkbox.h index 8991170..c937d0e 100644 --- a/src/node_checkbox.h +++ b/src/node_checkbox.h @@ -10,7 +10,7 @@ public: NodeBorder* m_outer; NodeBorder* m_inner; NodeImage* m_icon; - std::string m_icon_path; + std::string m_icon_path = "data/ui/check-v.png"; bool checked = false; virtual Node* clone_instantiate() const override; virtual void clone_children(Node* dest) const override;