fix for title color in old edl xml, fix default edit popup color value

diff --git a/cinelerra-5.1/cinelerra/edit.C b/cinelerra-5.1/cinelerra/edit.C
index e40b8c18924c5f1d712d620582b8c08240c062fe..fc36b187f6cca511f92b205ef4cf81709b6e58e5 100644 (file)
--- a/cinelerra-5.1/cinelerra/edit.C
+++ b/cinelerra-5.1/cinelerra/edit.C
@@ -406,7 +406,7 @@ int Edit::load_properties(FileXML *file, int64_t &startproject)
        length = file->tag.get_property("LENGTH", (int64_t)0);
        hard_left = file->tag.get_property("HARD_LEFT", (int64_t)0);
        hard_right = file->tag.get_property("HARD_RIGHT", (int64_t)0);
        length = file->tag.get_property("LENGTH", (int64_t)0);
        hard_left = file->tag.get_property("HARD_LEFT", (int64_t)0);
        hard_right = file->tag.get_property("HARD_RIGHT", (int64_t)0);

-       color = file->tag.get_property("COLOR", (int64_t)-1);
+       color = file->tag.get_property("COLOR", 0);

        group_id = file->tag.get_property("GROUP_ID", group_id);
        user_title[0] = 0;
        file->tag.get_property("USER_TITLE", user_title);
        group_id = file->tag.get_property("GROUP_ID", group_id);
        user_title[0] = 0;
        file->tag.get_property("USER_TITLE", user_title);

diff --git a/cinelerra-5.1/cinelerra/editpopup.C b/cinelerra-5.1/cinelerra/editpopup.C
index f48f0564c6755385359e7f10067a34b0cc3fc3c2..34aadc468797c4eba2746b7e29b44a27a4d4359a 100644 (file)
--- a/cinelerra-5.1/cinelerra/editpopup.C
+++ b/cinelerra-5.1/cinelerra/editpopup.C
@@ -441,7 +441,7 @@ EditTitleColorDefault::EditTitleColorDefault(
 
 int EditTitleColorDefault::handle_event()
 {
 
 int EditTitleColorDefault::handle_event()
 {

-       const int color = 0, alpha = 0;
+       const int color = 0, alpha = 0xff;

        color_picker->color = color | (~alpha << 24);
        color_picker->update_gui(color, alpha);
        return 1;
        color_picker->color = color | (~alpha << 24);
        color_picker->update_gui(color, alpha);
        return 1;