projects
/
goodguy
/
cinelerra.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
fix for title color in old edl xml, fix default edit popup color value
[goodguy/cinelerra.git]
/
cinelerra-5.1
/
cinelerra
/
resourcepixmap.C
diff --git
a/cinelerra-5.1/cinelerra/resourcepixmap.C
b/cinelerra-5.1/cinelerra/resourcepixmap.C
index cd93e6541abcd051b830cd5f3a3cb64fa42a6c1a..4915a023c2db779ed2f020bf4b7aa5b63830b21e 100644
(file)
--- a/
cinelerra-5.1/cinelerra/resourcepixmap.C
+++ b/
cinelerra-5.1/cinelerra/resourcepixmap.C
@@
-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;
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.
// 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);
//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);
}
}