preset edit button, intl fix, drag window tweak, empty keyframe edit fix

[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 c153e3db8935ed9ef0e3cc59ed00f04c4ed5c0e5..24304c724b8cd7e6d6477a6539f137abb3529ed0 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(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);
        }
@@ -414,7 +413,7 @@ int AssetListCopy::handle_event()
        }
        *cp = 0;
        int cur_x, cur_y;
-       gui->get_abs_cursor_xy(cur_x, cur_y, 0);
+       gui->get_abs_cursor(cur_x, cur_y, 0);
        gui->unlock_window(); 
 
        if( n ) {
@@ -528,7 +527,7 @@ int AssetListPaste::handle_event()
        else
                paste_dialog->close_window();
        int cur_x, cur_y;
-       gui->get_abs_cursor_xy(cur_x, cur_y, 0);
+       gui->get_abs_cursor(cur_x, cur_y, 0);
        paste_dialog->start(cur_x, cur_y);
        return 1;
 }