diff --git a/src/DrawingProgram/Layers/DrawingProgramLayerManager.cpp b/src/DrawingProgram/Layers/DrawingProgramLayerManager.cpp index 6b2fed6..7194055 100644 --- a/src/DrawingProgram/Layers/DrawingProgramLayerManager.cpp +++ b/src/DrawingProgram/Layers/DrawingProgramLayerManager.cpp @@ -102,6 +102,7 @@ std::vector DrawingProgramLayerManage throw std::runtime_error("[DrawingProgramLayerManager::add_many_components_to_layer_being_edited] No layer selected!"); auto toRet = editLayerPtr->get_layer().components->insert_ordered_list_and_send_create(editLayerPtr->get_layer().components, newObjs); add_undo_place_components(editingLayer.lock().get(), toRet); + return toRet; } return {}; } diff --git a/src/GUIStuff/GUIManager.cpp b/src/GUIStuff/GUIManager.cpp index ca2b200..22c9fd7 100644 --- a/src/GUIStuff/GUIManager.cpp +++ b/src/GUIStuff/GUIManager.cpp @@ -381,7 +381,7 @@ bool GUIManager::radio_button_field(const char* id, std::string_view name, bool bool GUIManager::input_color_component_255(const char* id, float* val, const std::function& elemUpdate) { push_id(id); bool isUpdating = insert_element>()->update(*io, val, - [&](std::string_view str) { + [&](const std::string& str) { int roundTo255; std::stringstream ss; ss << str; @@ -520,7 +520,7 @@ bool GUIManager::input_scalar(const char* id, uint8_t* val, uint8_t min, uint8_t bool isUpdating = false; push_id(id); isUpdating = insert_element>()->update(*io, val, - [&](std::string_view a) { + [&](const std::string& a) { if(a.empty()) return min; uint32_t toRet; diff --git a/src/GUIStuff/GUIManager.hpp b/src/GUIStuff/GUIManager.hpp index 6b22929..abe8fe2 100644 --- a/src/GUIStuff/GUIManager.hpp +++ b/src/GUIStuff/GUIManager.hpp @@ -147,7 +147,7 @@ class GUIManager { return toRet; } - template bool input_generic(const char* id, T* val, const std::function(std::string_view)>& fromStr, const std::function& toStr, bool singleLine, bool updateEveryEdit, const std::function& elemUpdate = nullptr) { + template bool input_generic(const char* id, T* val, const std::function(const std::string&)>& fromStr, const std::function& toStr, bool singleLine, bool updateEveryEdit, const std::function& elemUpdate = nullptr) { bool isUpdating = false; push_id(id); isUpdating = insert_element>()->update(*io, val, fromStr, toStr, singleLine, updateEveryEdit, elemUpdate); @@ -157,7 +157,7 @@ class GUIManager { template bool input_scalar(const char* id, T* val, T min, T max, int decimalPrecision = 0, const std::function& elemUpdate = nullptr) { return input_generic(id, val, - [&](std::string_view a) { + [&](const std::string& a) { if(a.empty()) return min; T toRet; @@ -199,7 +199,7 @@ class GUIManager { template bool input_color_hex(const char* id, T* val, bool selectAlpha, const std::function& elemUpdate = nullptr) { return input_generic(id, val, - [&](std::string_view str) { + [&](const std::string& str) { T def = {0.0f, 0.0f, 0.0f, 1.0f}; unsigned startIndex = 0; if(str.empty())