implement clipboard on OSX, fix hex and rob sliders on picker

This commit is contained in:
2019-06-25 16:38:05 +02:00
parent da6da775a0
commit 746726e5b3
6 changed files with 26 additions and 8 deletions

View File

@@ -117,9 +117,9 @@ void NodeColorPicker::init_controls()
m_slider_s->m_value = hsv.y;
m_slider_v->m_value = hsv.z;
glm::vec3 rgb = convert_hsv2rgb(hsv);
m_slider_h->set_value(hsv.x);
m_slider_s->set_value(hsv.y);
m_slider_v->set_value(hsv.z);
m_slider_r->set_value(rgb.x);
m_slider_g->set_value(rgb.y);
m_slider_b->set_value(rgb.z);
m_color_cur->m_color = { rgb, 1 };
if (on_color_change)
on_color_change(this, rgb);
@@ -166,7 +166,7 @@ void NodeColorPicker::init_controls()
void NodeColorPicker::update_hex(glm::vec3 rgb)
{
char tmp[32];
snprintf(tmp, sizeof(tmp), "%xul", convert_rgb_long(rgb));
snprintf(tmp, sizeof(tmp), "%x", convert_rgb_long(rgb));
m_txt_hex->set_text_format("#%s", tmp);
}