projects
/
goodguy
/
cinelerra.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
e23393f
)
clear group_id on move_edits, neoph about_bg leak, use inv clr on edit title bar...
author
Good Guy
<good1.2guy@gmail.com>
Thu, 20 Dec 2018 17:32:05 +0000
(10:32 -0700)
committer
Good Guy
<good1.2guy@gmail.com>
Thu, 20 Dec 2018 17:32:05 +0000
(10:32 -0700)
cinelerra-5.1/cinelerra/mwindow.C
patch
|
blob
|
history
cinelerra-5.1/cinelerra/resourcepixmap.C
patch
|
blob
|
history
cinelerra-5.1/cinelerra/tracksedit.C
patch
|
blob
|
history
cinelerra-5.1/plugins/theme_neophyte/neophyte.C
patch
|
blob
|
history
diff --git
a/cinelerra-5.1/cinelerra/mwindow.C
b/cinelerra-5.1/cinelerra/mwindow.C
index 6e8547d6359f231493c37e64b74b162d6396179a..9ad32f610027f14f24752918a4c5113a7996f7ec 100644
(file)
--- a/
cinelerra-5.1/cinelerra/mwindow.C
+++ b/
cinelerra-5.1/cinelerra/mwindow.C
@@
-3354,7
+3354,7
@@
int MWindow::get_title_color(Edit *edit)
else
return 0;
}
else
return 0;
}
- if(
!alpha
)
+ if(
alpha == 0xff
)
alpha = session->title_bar_alpha*255;
return color | (~alpha<<24);
}
alpha = session->title_bar_alpha*255;
return color | (~alpha<<24);
}
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);
}
}
diff --git
a/cinelerra-5.1/cinelerra/tracksedit.C
b/cinelerra-5.1/cinelerra/tracksedit.C
index b80a8887a0781200864511b60d1a9eb8f88d8ac9..0aa3634c0bb336f8628ad83f7e9a5839c4f79b73 100644
(file)
--- a/
cinelerra-5.1/cinelerra/tracksedit.C
+++ b/
cinelerra-5.1/cinelerra/tracksedit.C
@@
-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;
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;
}
}
Track *src = group->tracks->first;
diff --git
a/cinelerra-5.1/plugins/theme_neophyte/neophyte.C
b/cinelerra-5.1/plugins/theme_neophyte/neophyte.C
index cfb1a541671e9c4c00986e618055b400819a25bb..b23ddf59b7a995de2109467bc0f5376d61f7980b 100644
(file)
--- a/
cinelerra-5.1/plugins/theme_neophyte/neophyte.C
+++ b/
cinelerra-5.1/plugins/theme_neophyte/neophyte.C
@@
-106,6
+106,7
@@
void NEOPHYTETHEME::initialize()
/* Something own, fitting to the theme and independent of
the integrated splash screen/about */
// Preferences: About (logo)
/* 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
about_bg = new VFramePng(get_image_data("about_bg.png"));
/* Replacement for the heroine icon. Everyone has his