projects
/
goodguy
/
cinelerra.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
add gang points to mask_gui, add missing projector xform to centroid marker, fix...
[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 9a995958c27377fd0c3a1762ddb5af763ea831e4..57601d7e7bbb7e5dab408d2829c005af9623d2ee 100644
(file)
--- a/
cinelerra-5.1/cinelerra/colorpicker.C
+++ b/
cinelerra-5.1/cinelerra/colorpicker.C
@@
-311,7
+311,9
@@
void ColorWindow::update_display()
int ColorWindow::handle_event()
{
int ColorWindow::handle_event()
{
+ unlock_window();
thread->handle_new_color(rgb888(), alpha8());
thread->handle_new_color(rgb888(), alpha8());
+ lock_window("ColorWindow::handle_event");
return 1;
}
return 1;
}
@@
-1275,8
+1277,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);
- 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()