projects
/
goodguy
/
cinelerra.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
add mask smooth boundary
[goodguy/cinelerra.git]
/
cinelerra-5.1
/
cinelerra
/
colorpicker.C
diff --git
a/cinelerra-5.1/cinelerra/colorpicker.C
b/cinelerra-5.1/cinelerra/colorpicker.C
index b910b9f4cab42dc2d5ce6a201815b4be97ee5396..72efa4a69fff306cda3519d97c647d7ad6e63f83 100644
(file)
--- a/
cinelerra-5.1/cinelerra/colorpicker.C
+++ b/
cinelerra-5.1/cinelerra/colorpicker.C
@@
-1275,9
+1275,10
@@
void ColorButtonPicker::update(int color, int alpha)
int ColorButtonPicker::handle_new_color(int color, int alpha)
{
int ColorButtonPicker::handle_new_color(int color, int alpha)
{
- update(color, alpha);
- color_button->handle_new_color(color, alpha);
- return 1;
+ color_button->lock_window("ColorButtonPicker::handle_new_color");
+ color_button->update_gui(color, alpha);
+ color_button->unlock_window();
+ return color_button->handle_new_color(color, alpha);
}
void ColorButtonPicker::update_gui()
}
void ColorButtonPicker::update_gui()
@@
-1290,6
+1291,7
@@
void ColorButtonPicker::update_gui()
void ColorButtonPicker::update_gui(int color, int alpha)
{
ColorPicker::update_gui(color, alpha);
void ColorButtonPicker::update_gui(int color, int alpha)
{
ColorPicker::update_gui(color, alpha);
+ color_button->handle_new_color(color, alpha);
}
ColorButtonThread::ColorButtonThread(ColorButton *color_button)
}
ColorButtonThread::ColorButtonThread(ColorButton *color_button)