X-Git-Url: https://git.cinelerra-gg.org/git/?p=goodguy%2Fcinelerra.git;a=blobdiff_plain;f=cinelerra-5.1%2Fcinelerra%2Fcolorpicker.C;h=f3e87b35fc42d586f9c39f03ef3424ac35b6f5ca;hp=1b40fcf0c38f8d00bca6f4b35972422918d71c3c;hb=3fc547b01e919d3044bacf2a78baddeaed04e3a0;hpb=7fd85fb66168f6b518c5f2d73e04036e87faa0e1 diff --git a/cinelerra-5.1/cinelerra/colorpicker.C b/cinelerra-5.1/cinelerra/colorpicker.C index 1b40fcf0..f3e87b35 100644 --- a/cinelerra-5.1/cinelerra/colorpicker.C +++ b/cinelerra-5.1/cinelerra/colorpicker.C @@ -43,8 +43,8 @@ ColorPicker::ColorPicker(int do_alpha, const char *title) this->title = title; this->do_alpha = do_alpha; this->do_okcancel = 0; - this->output = BLACK; - this->alpha = 255; + this->output = this->orig_color = BLACK; + this->alpha = this->orig_alpha = 255; } ColorPicker::~ColorPicker() @@ -63,6 +63,8 @@ void ColorPicker::start_window(int output, int alpha, int do_okcancel) } return; } + this->orig_color = output; + this->orig_alpha = alpha; this->output = output; this->alpha = alpha; this->do_okcancel = do_okcancel; @@ -300,8 +302,10 @@ void ColorWindow::update_display() yuv_v->update(yuv.v); hex_box->update(); - if( thread->do_alpha ) + if( thread->do_alpha ) { + alpha->update(aph); aph_a->update(aph); + } } int ColorWindow::handle_event() @@ -801,6 +805,7 @@ PaletteAlpha::~PaletteAlpha() int PaletteAlpha::handle_event() { window->aph = get_value(); + window->aph_a->update(window->aph); window->handle_event(); return 1; }