integrate quick panel and new color picker

2019-03-04 18:38:38 +01:00
parent fb006a6859
commit 6e73a9eee5
13 changed files with 234 additions and 81 deletions
--- a/src/node_button_custom.cpp
+++ b/src/node_button_custom.cpp
@@ -29,6 +29,11 @@ void NodeButtonCustom::loaded()
    m_mouse_ignore = false;
 }

+bool NodeButtonCustom::is_active()
+{
+    return m_active;
+}
+
 void NodeButtonCustom::set_active(bool active)
 {
    if (m_active == active)
@@ -40,7 +45,7 @@ void NodeButtonCustom::set_active(bool active)
 void NodeButtonCustom::set_color(const glm::vec4& c)
 {
    color_normal = c;
-    m_color = color_normal;
+    m_color = m_active ? color_active : (m_mouse_inside ? color_hover : color_normal);
 }

 kEventResult NodeButtonCustom::handle_event(Event* e)