X-Git-Url: https://git.cinelerra-gg.org/git/?a=blobdiff_plain;f=cinelerra-5.1%2Fcinelerra%2Ftrackpopup.C;h=c00c023d39ce25389bbc96aed2bdbd61d75d44b3;hb=6cf1b80d50c6b458241a0d43487fb8519c575c97;hp=e914bf741491e2808243b86de959470c3332df14;hpb=0df48ad2d876409c5beeae2e21933a728ea76c33;p=goodguy%2Fcinelerra.git diff --git a/cinelerra-5.1/cinelerra/trackpopup.C b/cinelerra-5.1/cinelerra/trackpopup.C index e914bf74..c00c023d 100644 --- a/cinelerra-5.1/cinelerra/trackpopup.C +++ b/cinelerra-5.1/cinelerra/trackpopup.C @@ -454,10 +454,12 @@ TrackTitleColorPicker::~TrackTitleColorPicker() } void TrackTitleColorPicker::create_objects(ColorWindow *gui) { + gui->lock_window("TrackTitleColorPicker::create_objects"); int y = gui->get_h() - BC_CancelButton::calculate_h() + yS(10); int x = gui->get_w() - BC_CancelButton::calculate_w() - xS(10); x -= BC_GenericButton::calculate_w(gui, _("default")) + xS(15); gui->add_subwindow(new TrackTitleColorDefault(this, x, y)); + gui->unlock_window(); } int TrackTitleColorPicker::handle_new_color(int color, int alpha) @@ -573,15 +575,16 @@ void TrackPopupShowWindow::create_objects() add_subwindow(title = new BC_Title(x, y, text)); int x1 = x + title->get_w() + xS(10); int tw = get_w() - x1 - xS(20); - truncate_text(text, track->title, tw); - add_subwindow(new BC_Title(x1, y, text)); + char *track_title = get_truncated_text(MEDIUMFONT, track->title, tw); + add_subwindow(new BC_Title(x1, y, track_title)); + delete [] track_title; y += title->get_h() + 5; sprintf(text, _("Edit %d:"), track->edits->number_of(edit)+1); add_subwindow(title = new BC_Title(x, y, text)); - char edit_title[BCTEXTLEN]; - edit->get_title(edit_title); - truncate_text(text, edit_title, tw); - add_subwindow(new BC_Title(x1, y, text)); + edit->get_title(text); + char *edit_title = get_truncated_text(MEDIUMFONT, text, tw); + add_subwindow(new BC_Title(x1, y, edit_title)); + delete [] edit_title; y += title->get_h() + 5; EDLSession *session = mwindow->edl->session;