merged hv7 mod

[goodguy/history.git] / cinelerra-5.1 / cinelerra / assetpopup.C

diff --git a/cinelerra-5.1/cinelerra/assetpopup.C b/cinelerra-5.1/cinelerra/assetpopup.C
index bc556ae61a09936e6f75570219ef95e40f0fabcf..75c1bfa2d1efeaf663ae9d355ad4830e978d52ec 100644 (file)
--- a/cinelerra-5.1/cinelerra/assetpopup.C
+++ b/cinelerra-5.1/cinelerra/assetpopup.C
@@ -145,14 +145,13 @@ AssetPopupInfo::~AssetPopupInfo()
 int AssetPopupInfo::handle_event()
 {
        int cur_x, cur_y;
-       popup->gui->get_abs_cursor_xy(cur_x, cur_y, 0);
-       
-       if( mwindow->session->drag_assets->total ) {
-               mwindow->awindow->asset_edit->edit_asset(
+       popup->gui->get_abs_cursor_xy(cur_x, cur_y);
+       if( mwindow->session->drag_assets->size() ) {
+               AssetEdit *asset_edit = mwindow->awindow->get_asset_editor();
+               asset_edit->edit_asset(
                        mwindow->session->drag_assets->values[0], cur_x, cur_y);
        }
-       else
-       if( mwindow->session->drag_clips->total ) {
+       else if( mwindow->session->drag_clips->size() ) {
                popup->gui->awindow->clip_edit->edit_clip(
                        mwindow->session->drag_clips->values[0], cur_x, cur_y);
        }
@@ -432,30 +431,30 @@ int AssetListCopy::handle_event()
 AssetCopyDialog::AssetCopyDialog(AssetListCopy *copy)
  : BC_DialogThread()
 {
-        this->copy = copy;
+       this->copy = copy;
        copy_window = 0;
 }
 
 void AssetCopyDialog::start(char *text, int x, int y)
 {
-        close_window();
-        this->text = text;
+       close_window();
+       this->text = text;
        this->x = x;  this->y = y;
        BC_DialogThread::start();
 }
 
 AssetCopyDialog::~AssetCopyDialog()
 {
-        close_window();
+       close_window();
 }
 
 BC_Window* AssetCopyDialog::new_gui()
 {
-        BC_DisplayInfo display_info;
+       BC_DisplayInfo display_info;
 
-        copy_window = new AssetCopyWindow(this);
-        copy_window->create_objects();
-        return copy_window;
+       copy_window = new AssetCopyWindow(this);
+       copy_window->create_objects();
+       return copy_window;
 }
 
 void AssetCopyDialog::handle_done_event(int result)
@@ -465,16 +464,16 @@ void AssetCopyDialog::handle_done_event(int result)
 
 void AssetCopyDialog::handle_close_event(int result)
 {
-        copy_window = 0;
+       copy_window = 0;
 }
 
 
 AssetCopyWindow::AssetCopyWindow(AssetCopyDialog *copy_dialog)
  : BC_Window(_(PROGRAM_NAME ": Copy File List"),
        copy_dialog->x - 500/2, copy_dialog->y - 200/2,
-       500, 200, 500, 200, 0, 0, 1)
+       500, 200, 500, 200, 1, 0, 1)
 {
-        this->copy_dialog = copy_dialog;
+       this->copy_dialog = copy_dialog;
 }
 
 AssetCopyWindow::~AssetCopyWindow()
@@ -496,9 +495,18 @@ void AssetCopyWindow::create_objects()
        file_list->create_objects();
 
        add_subwindow(new BC_OKButton(this));
-        show_window();
+       show_window();
 }
 
+int AssetCopyWindow::resize_event(int w, int h)
+{
+       int fx = file_list->get_x(), fy = file_list->get_y(), pad = 5;
+       int text_w = w - fx - 10;
+       int text_h = h - fy - BC_OKButton::calculate_h() - pad;
+       int text_rows = BC_TextBox::pixels_to_rows(this, MEDIUMFONT, text_h);
+       file_list->reposition_window(fx, fy, text_w, text_rows);
+       return 0;
+}
 
 AssetListPaste::AssetListPaste(MWindow *mwindow, AWindowGUI *gui)
  : BC_MenuItem(_("Paste file list"))
@@ -515,9 +523,9 @@ AssetListPaste::~AssetListPaste()
 int AssetListPaste::handle_event()
 {
        if( !paste_dialog )
-               paste_dialog->close_window();
-       else
                paste_dialog = new AssetPasteDialog(this);
+       else
+               paste_dialog->close_window();
        int cur_x, cur_y;
        gui->get_abs_cursor_xy(cur_x, cur_y, 0);
        paste_dialog->start(cur_x, cur_y);
@@ -527,20 +535,20 @@ int AssetListPaste::handle_event()
 AssetPasteDialog::AssetPasteDialog(AssetListPaste *paste)
  : BC_DialogThread()
 {
-        this->paste = paste;
+       this->paste = paste;
        paste_window = 0;
 }
 
 AssetPasteDialog::~AssetPasteDialog()
 {
-        close_window();
+       close_window();
 }
 
 BC_Window* AssetPasteDialog::new_gui()
 {
-        paste_window = new AssetPasteWindow(this);
-        paste_window->create_objects();
-        return paste_window;
+       paste_window = new AssetPasteWindow(this);
+       paste_window->create_objects();
+       return paste_window;
 }
 
 void AssetPasteDialog::handle_done_event(int result)
@@ -569,14 +577,14 @@ void AssetPasteDialog::handle_done_event(int result)
        result = mwindow->load_filenames(&path_list, LOADMODE_RESOURCESONLY, 0);
        mwindow->gui->unlock_window();
        path_list.remove_all_objects();
-        mwindow->save_backup();
-        mwindow->restart_brender();
+       mwindow->save_backup();
+       mwindow->restart_brender();
        mwindow->session->changes_made = 1;
 }
 
 void AssetPasteDialog::handle_close_event(int result)
 {
-        paste_window = 0;
+       paste_window = 0;
 }
 
 void AssetPasteDialog::start(int x, int y)
@@ -588,9 +596,9 @@ void AssetPasteDialog::start(int x, int y)
 AssetPasteWindow::AssetPasteWindow(AssetPasteDialog *paste_dialog)
  : BC_Window(_(PROGRAM_NAME ": Paste File List"),
        paste_dialog->x - 500/2, paste_dialog->y - 200/2,
-       500, 200, 500, 200, 0, 0, 1)
+       500, 200, 500, 200, 1, 0, 1)
 {
-        this->paste_dialog = paste_dialog;
+       this->paste_dialog = paste_dialog;
 }
 
 AssetPasteWindow::~AssetPasteWindow()
@@ -610,6 +618,16 @@ void AssetPasteWindow::create_objects()
        file_list->create_objects();
        add_subwindow(new BC_OKButton(this));
        add_subwindow(new BC_CancelButton(this));
-        show_window();
+       show_window();
+}
+
+int AssetPasteWindow::resize_event(int w, int h)
+{
+       int fx = file_list->get_x(), fy = file_list->get_y(), pad = 5;
+       int text_w = w - fx - 10;
+       int text_h = h - fy - BC_OKButton::calculate_h() - pad;
+       int text_rows = BC_TextBox::pixels_to_rows(this, MEDIUMFONT, text_h);
+       file_list->reposition_window(fx, fy, text_w, text_rows);
+       return 0;
 }