X-Git-Url: https://git.cinelerra-gg.org/git/?a=blobdiff_plain;f=cinelerra-5.1%2Fcinelerra%2Ftheme.C;h=d89c789f76cb95018e954fc1f0d65002c16e0d7c;hb=1da768016a2ecba0296b03d75c02879f99a0f582;hp=1700a5b371ea91257d4ae738d381aeb4174ef283;hpb=6e880be00673eac08e9463e3ce752aaf4c18085b;p=goodguy%2Fcinelerra.git diff --git a/cinelerra-5.1/cinelerra/theme.C b/cinelerra-5.1/cinelerra/theme.C index 1700a5b3..d89c789f 100644 --- a/cinelerra-5.1/cinelerra/theme.C +++ b/cinelerra-5.1/cinelerra/theme.C @@ -24,6 +24,7 @@ #include "clip.h" #include "bccolors.h" #include "cwindowgui.h" +#include "edit.h" #include "edl.h" #include "edlsession.h" #include "keyframegui.h" @@ -46,6 +47,7 @@ #include "resourcepixmap.h" #include "statusbar.h" #include "theme.h" +#include "track.h" #include "timebar.h" #include "trackcanvas.h" #include "vframe.h" @@ -177,6 +179,7 @@ Theme::Theme() statusbar_cancel_data = 0; timebar_view_data = 0; transition_data = 0; + tumblepatch_data = 0; uptriangle_data = 0; viewasset_data = 0; vtimebar_bg_data = 0; @@ -871,12 +874,13 @@ void Theme::draw_rwindow_bg(RecordGUI *gui) } -void Theme::draw_resource_bg(TrackCanvas *canvas, ResourcePixmap *pixmap, int color, - int edit_x, int edit_w, int pixmap_x, int x1, int y1, int x2, int y2) +void Theme::draw_resource_bg(TrackCanvas *canvas, ResourcePixmap *pixmap, + int color, Edit *edit, int edit_x, int edit_w, + int pixmap_x, int x1, int y1, int x2, int y2) { VFrame *image = 0; - - switch(mwindow->edl->local_session->zoom_track) { + int data_h = edit->track->data_h; + switch( data_h ) { case 1024: image = get_image("resource1024"); break; case 512: image = get_image("resource512"); break; case 256: image = get_image("resource256"); break;