From 087894451b8afa45a37eb476524b3a649f3a759b Mon Sep 17 00:00:00 2001 From: omigamedev Date: Sun, 28 Jul 2019 15:19:13 +0200 Subject: [PATCH] update colors on HEX clipboard paste --- src/node_dialog_picker.cpp | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/node_dialog_picker.cpp b/src/node_dialog_picker.cpp index 6f93ade..e96d34e 100644 --- a/src/node_dialog_picker.cpp +++ b/src/node_dialog_picker.cpp @@ -93,7 +93,7 @@ void NodeColorPicker::init_controls() m_btn_paste->on_click = [this](Node*) { std::string s = App::I->clipboard_get_text(); - std::regex r("#([\\dabcdefABCDEF]{6})"); + std::regex r("#?([\\dabcdefABCDEF]{6})"); std::smatch m; if (std::regex_search(s, m, r)) { @@ -103,6 +103,8 @@ void NodeColorPicker::init_controls() uint8_t r = (ul >> 16) & 0xFF; auto rgb = glm::vec3(r, g, b) / 255.f; set_color(rgb); + if (on_color_change) + on_color_change(this, rgb); } };