X-Git-Url: https://git.cinelerra-gg.org/git/?p=goodguy%2Fcinelerra.git;a=blobdiff_plain;f=cinelerra-5.1%2Fcinelerra%2Fcolorpicker.C;h=348817c4bac2915f44f10dd963d3e1ade73bba37;hp=26451d7086a68bf2ef968efe6e71113f8d4d6ac1;hb=9ffdfbe8e6fa7daaad4dcfdd46b6ac7b6e7a47e8;hpb=5d8a7826b0f80f00622e46baf75453995a76e343 diff --git a/cinelerra-5.1/cinelerra/colorpicker.C b/cinelerra-5.1/cinelerra/colorpicker.C index 26451d70..348817c4 100644 --- a/cinelerra-5.1/cinelerra/colorpicker.C +++ b/cinelerra-5.1/cinelerra/colorpicker.C @@ -86,6 +86,7 @@ BC_Window* ColorPicker::new_gui() if( x < 0 ) x = 0; if( y < 0 ) y = 0; ColorWindow *window = new ColorWindow(this, x, y, w, h, window_title); + window->create_objects(); window->start_selection(color, !do_alpha ? -1 : alpha, ok_cancel); return window; } @@ -114,6 +115,13 @@ ColorWindow::~ColorWindow() { } +void ColorWindow::create_objects() +{ + BC_WindowBase::create_objects(); + ColorGUI::create_objects(); + thread->create_objects(this); +} + void ColorWindow::update_gui(int color, int alpha) { lock_window("ColorWindow::update_gui"); @@ -244,6 +252,8 @@ void ColorGUI::create_objects() x += hue->get_w() + xs10; hsv_h = new PaletteHSV(this, x,y= y0, hsv.h, 0, 360); + hsv_h->set_increment(1); + hsv_h->set_precision(1); hsv_h->create_objects(); hsv_h->set_tooltip(_("Hue")); hsv_s = new PaletteHSV(this, x,y+=ys25, hsv.s, 0, 1); hsv_s->create_objects(); hsv_s->set_tooltip(_("Saturation")); @@ -1354,7 +1364,7 @@ void ColorButtonPicker::update(int color, int alpha) int ColorButtonPicker::handle_new_color(int color, int alpha) { color_button->lock_window("ColorButtonPicker::handle_new_color"); - color_button->update_gui(color, alpha); + color_button->update_gui(color); color_button->unlock_window(); return color_button->handle_new_color(color, alpha); }