fix for title color in old edl xml, fix default edit popup color value
authorGood Guy <good1.2guy@gmail.com>
Fri, 21 Dec 2018 03:20:24 +0000 (20:20 -0700)
committerGood Guy <good1.2guy@gmail.com>
Fri, 21 Dec 2018 03:20:24 +0000 (20:20 -0700)
cinelerra-5.1/cinelerra/edit.C
cinelerra-5.1/cinelerra/editpopup.C

index e40b8c1..fc36b18 100644 (file)
@@ -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);
index f48f056..34aadc4 100644 (file)
@@ -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;