clear group_id on move_edits, neoph about_bg leak, use inv clr on edit title bar...
authorGood Guy <good1.2guy@gmail.com>
Thu, 20 Dec 2018 17:32:05 +0000 (10:32 -0700)
committerGood Guy <good1.2guy@gmail.com>
Thu, 20 Dec 2018 17:32:05 +0000 (10:32 -0700)
cinelerra-5.1/cinelerra/mwindow.C
cinelerra-5.1/cinelerra/resourcepixmap.C
cinelerra-5.1/cinelerra/tracksedit.C
cinelerra-5.1/plugins/theme_neophyte/neophyte.C

index 6e8547d..9ad32f6 100644 (file)
@@ -3354,7 +3354,7 @@ int MWindow::get_title_color(Edit *edit)
                else
                        return 0;
        }
-       if( !alpha )
+       if( alpha == 0xff )
                alpha = session->title_bar_alpha*255;
        return color | (~alpha<<24);
 }
index cd93e65..4915a02 100644 (file)
@@ -304,21 +304,20 @@ void ResourcePixmap::draw_title(TrackCanvas *canvas,
        canvas->draw_3segmenth(x, 0, w, total_x, total_w, title_bar, this);
        if( title_bar != title_bg ) delete title_bar;
 
-//     if( total_x > -BC_INFINITY ) {
-               char title[BCTEXTLEN];
-               edit->get_title(title);
-               canvas->set_color(mwindow->theme->title_color);
-               canvas->set_font(mwindow->theme->title_font);
+       char title[BCTEXTLEN];
+       edit->get_title(title);
+       color = color ? ~color & 0xffffff : mwindow->theme->title_color;
+       canvas->set_color(color);
+       canvas->set_font(mwindow->theme->title_font);
 
 // Justify the text on the left boundary of the edit if it is visible.
 // Otherwise justify it on the left side of the screen.
-               int text_x = total_x + left_margin;
-               text_x = MAX(left_margin, text_x);
+       int text_x = total_x + left_margin;
+       text_x = MAX(left_margin, text_x);
 //printf("ResourcePixmap::draw_title 1 %d\n", text_x);
-               canvas->draw_text(text_x,
-                       canvas->get_text_ascent(mwindow->theme->title_font) + 2,
-                       title, strlen(title), this);
-//     }
+       canvas->draw_text(text_x, // 2,
+               canvas->get_text_ascent(mwindow->theme->title_font) + 2,
+               title, strlen(title), this);
 }
 
 
index b80a888..0aa3634 100644 (file)
@@ -746,7 +746,9 @@ void Tracks::move_group(EDL *group, Track *first_track, double position)
                if( !track->record ) continue;
                for( Edit *edit=track->edits->first; edit; edit=edit->next ) {
                        if( !edit->is_selected ) continue;
-                       edit->mute();  edit->is_selected = 0;
+                       edit->mute();
+                       edit->is_selected = 0;
+                       edit->group_id = 0;
                }
        }
        Track *src = group->tracks->first;
index cfb1a54..b23ddf5 100644 (file)
@@ -106,6 +106,7 @@ void NEOPHYTETHEME::initialize()
        /* Something own, fitting to the theme and independent of
           the integrated splash screen/about */
        // Preferences: About (logo)
+       delete about_bg;
        about_bg = new VFramePng(get_image_data("about_bg.png"));
        
        /* Replacement for the heroine icon. Everyone has his