projects
/
goodguy
/
cinelerra.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
fix for title color in old edl xml, fix default edit popup color value
[goodguy/cinelerra.git]
/
cinelerra-5.1
/
cinelerra
/
editpopup.C
diff --git
a/cinelerra-5.1/cinelerra/editpopup.C
b/cinelerra-5.1/cinelerra/editpopup.C
index cbc57606b3fac5139769e18178882e55b6ac51e8..34aadc468797c4eba2746b7e29b44a27a4d4359a 100644
(file)
--- a/
cinelerra-5.1/cinelerra/editpopup.C
+++ b/
cinelerra-5.1/cinelerra/editpopup.C
@@
-116,7
+116,7
@@
EditPopupCopy::EditPopupCopy(MWindow *mwindow, EditPopup *popup)
int EditPopupCopy::handle_event()
{
int EditPopupCopy::handle_event()
{
- mwindow->selected_to_clipboard(0);
+ mwindow->selected_
edits_
to_clipboard(0);
return 1;
}
return 1;
}
@@
-131,7
+131,7
@@
EditPopupCopyPack::EditPopupCopyPack(MWindow *mwindow, EditPopup *popup)
int EditPopupCopyPack::handle_event()
{
int EditPopupCopyPack::handle_event()
{
- mwindow->selected_to_clipboard(1);
+ mwindow->selected_
edits_
to_clipboard(1);
return 1;
}
return 1;
}
@@
-441,8
+441,9
@@
EditTitleColorDefault::EditTitleColorDefault(
int EditTitleColorDefault::handle_event()
{
int EditTitleColorDefault::handle_event()
{
- color_picker->color = 0;
- color_picker->update_gui(0, 0);
+ const int color = 0, alpha = 0xff;
+ color_picker->color = color | (~alpha << 24);
+ color_picker->update_gui(color, alpha);
return 1;
}
return 1;
}