X-Git-Url: https://git.cinelerra-gg.org/git/?p=goodguy%2Fcinelerra.git;a=blobdiff_plain;f=cinelerra-5.1%2Fplugins%2Ftitler%2Ftitlerwindow.C;h=251389cd3240a5782c8330528a86acb506e6b883;hp=04f1ef69f3b4bad3cbc2e6bfeaad8028ea44fcb7;hb=d72d54c0e9d75486bb003e256630c77f77ce6368;hpb=258d9cb69d560f40961acdd20866e12e940c2f93 diff --git a/cinelerra-5.1/plugins/titler/titlerwindow.C b/cinelerra-5.1/plugins/titler/titlerwindow.C index 04f1ef69..251389cd 100644 --- a/cinelerra-5.1/plugins/titler/titlerwindow.C +++ b/cinelerra-5.1/plugins/titler/titlerwindow.C @@ -118,6 +118,8 @@ TitleWindow::TitleWindow(TitleMain *client) void TitleWindow::done_event(int result) { + color_button->close_picker(); + outline_button->close_picker(); drag->drag_deactivate(); delete color_popup; color_popup = 0; delete png_popup; png_popup = 0; @@ -780,7 +782,9 @@ void TitleColorButton::handle_done_event(int result) { if( result ) { handle_new_color(orig_color, orig_alpha); + window->lock_window("TitleColorButton::handle_done_event"); update_gui(orig_color); + window->unlock_window(); } } @@ -934,7 +938,7 @@ void TitleWindow::check_style(const char *font_name, int update) TitleFont::TitleFont(TitleMain *client, TitleWindow *window, int x, int y) : BC_PopupTextBox(window, &window->fonts, client->config.font, - x, y, 240, 300, LISTBOX_ICON_LIST) + x, y, 340, 300, LISTBOX_ICON_LIST) { this->client = client; this->window = window; @@ -1505,7 +1509,9 @@ void TitleColorPopup::handle_done_event(int result) { if( !result ) { char txt[BCSTRLEN]; sprintf(txt, "<%s #%06x>", _(KW_COLOR), color_value); + window->lock_window("TitleColorPopup::handle_done_event"); window->insert_ibeam(txt); + window->unlock_window(); } } @@ -1527,7 +1533,9 @@ void TitlePngPopup::handle_done_event(int result) BrowseButtonWindow *gui = (BrowseButtonWindow *)get_gui(); const char *path = gui->get_submitted_path(); char txt[BCSTRLEN]; sprintf(txt, "<%s %s>", _(KW_PNG), path); + window->lock_window("TitlePngPopup::handle_done_event"); window->insert_ibeam(txt); + window->unlock_window(); } BC_Window *TitlePngPopup::new_gui()