X-Git-Url: https://git.cinelerra-gg.org/git/?a=blobdiff_plain;ds=sidebyside;f=cinelerra-5.1%2Fcinelerra%2Fresourcepixmap.C;h=86fb5023d384252047453b4b89918e035dad38dd;hb=ab958f323d68316c450ef81ba296536580620163;hp=cd93e6541abcd051b830cd5f3a3cb64fa42a6c1a;hpb=e23393f4ff9f772ac8f47926cf490dc87a630ed4;p=goodguy%2Fcinelerra.git diff --git a/cinelerra-5.1/cinelerra/resourcepixmap.C b/cinelerra-5.1/cinelerra/resourcepixmap.C index cd93e654..86fb5023 100644 --- a/cinelerra-5.1/cinelerra/resourcepixmap.C +++ b/cinelerra-5.1/cinelerra/resourcepixmap.C @@ -238,10 +238,11 @@ VFrame *ResourcePixmap::change_title_color(VFrame *title_bg, int color) VFrame *title_bar = new VFrame(tw, th, colormodel); uint8_t cr = (color>>16), cg = (color>>8), cb = (color>>0); uint8_t **bar_rows = title_bar->get_rows(); + const uint8_t gap_grey = 0x4a; if( th > 0 ) { uint8_t *cp = bar_rows[0]; for( int x=0; x 3 ) cp[3] = 0xff; cp += bpp; } @@ -249,7 +250,7 @@ VFrame *ResourcePixmap::change_title_color(VFrame *title_bg, int color) for( int y=1; y 0 ) { - cp[0] = cp[1] = cp[2] = 0; + cp[0] = cp[1] = cp[2] = gap_grey; if( bpp > 3 ) cp[3] = 0xff; cp += bpp; } @@ -259,7 +260,7 @@ VFrame *ResourcePixmap::change_title_color(VFrame *title_bg, int color) cp += bpp; } if( tw > 1 ) { - cp[0] = cp[1] = cp[2] = 0; + cp[0] = cp[1] = cp[2] = gap_grey; if( bpp > 3 ) cp[3] = 0xff; } } @@ -304,21 +305,19 @@ 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); + canvas->set_color(mwindow->theme->title_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); }