X-Git-Url: https://git.cinelerra-gg.org/git/?p=goodguy%2Fcinelerra.git;a=blobdiff_plain;f=cinelerra-5.1%2Fcinelerra%2Fcolorpicker.C;h=f36374669e8185d503ed1065693739e67586e2f0;hp=76692f0d99dcb9630c40aa77085384f5b5c53817;hb=686bc04a488847170d80ec603f8c33962a7aa928;hpb=258d9cb69d560f40961acdd20866e12e940c2f93

diff --git a/cinelerra-5.1/cinelerra/colorpicker.C b/cinelerra-5.1/cinelerra/colorpicker.C
index 76692f0d..f3637466 100644
--- a/cinelerra-5.1/cinelerra/colorpicker.C
+++ b/cinelerra-5.1/cinelerra/colorpicker.C
@@ -96,7 +96,7 @@ void ColorPicker::update_gui(int output, int alpha)
 {
 	ColorWindow *gui = (ColorWindow *)get_gui();
 	if( !gui ) return;
-	gui->lock_window();
+	gui->lock_window("ColorPicker::update_gui");
 	this->output = output;
 	this->alpha = alpha;
 	gui->change_values();
@@ -311,7 +311,7 @@ void ColorWindow::update_display()
 
 int ColorWindow::handle_event()
 {
-	thread->handle_new_color(rgb888(), (int)(255*aph + 0.5));
+	thread->handle_new_color(rgb888(), alpha8());
 	return 1;
 }
 
@@ -360,8 +360,12 @@ int ColorWindow::button_release_event()
 
 void ColorWindow::update_rgb_hex(const char *hex)
 {
-	int color;
+	unsigned color;
 	if( sscanf(hex,"%x",&color) == 1 ) {
+		if( thread->do_alpha ) {
+			aph = ((color>>24) & 0xff) / 255.;
+			aph_a->update(aph);
+		}
 		float r = ((color>>16) & 0xff) / 255.;
 		float g = ((color>>8)  & 0xff) / 255.;
 		float b = ((color>>0)  & 0xff) / 255.;
@@ -807,6 +811,7 @@ int PaletteAlpha::handle_event()
 {
 	window->aph = get_value();
 	window->aph_a->update(window->aph);
+	window->hex_box->update();
 	window->handle_event();
 	return 1;
 }
@@ -973,6 +978,12 @@ int ColorWindow::rgb888()
 	bclamp(r, 0, 255);  bclamp(g, 0, 255);  bclamp(b, 0, 255);
 	return (r<<16) | (g<<8) | (b<<0);
 }
+int ColorWindow::alpha8()
+{
+	int a = 255*aph + 0.5;
+	bclamp(a, 0, 255);
+	return a;
+}
 
 PaletteNum::PaletteNum(ColorWindow *window, int x, int y,
 	float &output, float min, float max)
@@ -1047,7 +1058,10 @@ PaletteHex::~PaletteHex()
 }
 void PaletteHex::update()
 {
-	char hex[BCSTRLEN];  sprintf(hex,"%06x",window->rgb888());
+	char hex[BCSTRLEN], *cp = hex;
+	if( window->thread->do_alpha )
+		cp += sprintf(cp,"%02x", window->alpha8());
+	sprintf(cp,"%06x",window->rgb888());
 	BC_TextBox::update(hex);
 }