projects
/
goodguy
/
history.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
update shortcuts doc, period/comma alt shortcuts, popup deactivate fix, click2play...
[goodguy/history.git]
/
cinelerra-5.1
/
cinelerra
/
clippopup.C
diff --git
a/cinelerra-5.1/cinelerra/clippopup.C
b/cinelerra-5.1/cinelerra/clippopup.C
index 602fbbd03802354f344e7e57026ee571973eb82d..07ae7252fedd46e4749f085cb09b10aaceddfadc 100644
(file)
--- a/
cinelerra-5.1/cinelerra/clippopup.C
+++ b/
cinelerra-5.1/cinelerra/clippopup.C
@@
-138,10
+138,11
@@
ClipPopupInfo::~ClipPopupInfo()
int ClipPopupInfo::handle_event()
{
int cur_x, cur_y;
int ClipPopupInfo::handle_event()
{
int cur_x, cur_y;
- popup->gui->get_abs_cursor
_xy
(cur_x, cur_y, 0);
+ popup->gui->get_abs_cursor(cur_x, cur_y, 0);
if( mwindow->session->drag_assets->total ) {
if( mwindow->session->drag_assets->total ) {
- mwindow->awindow->asset_edit->edit_asset(
+ AssetEdit *asset_edit = mwindow->awindow->get_asset_editor();
+ asset_edit->edit_asset(
mwindow->session->drag_assets->values[0], cur_x, cur_y);
}
else
mwindow->session->drag_assets->values[0], cur_x, cur_y);
}
else
@@
-166,7
+167,7
@@
ClipPopupSort::~ClipPopupSort()
int ClipPopupSort::handle_event()
{
int ClipPopupSort::handle_event()
{
- mwindow->awindow->gui->sort_assets();
+ mwindow->awindow->gui->sort_assets(
0
);
return 1;
}
return 1;
}
@@
-185,7
+186,6
@@
ClipPopupView::~ClipPopupView()
int ClipPopupView::handle_event()
{
VWindow *vwindow = mwindow->get_viewer(1, DEFAULT_VWINDOW);
int ClipPopupView::handle_event()
{
VWindow *vwindow = mwindow->get_viewer(1, DEFAULT_VWINDOW);
- vwindow->gui->lock_window("ClipPopupView::handle_event");
if( mwindow->session->drag_assets->total )
vwindow->change_source(
if( mwindow->session->drag_assets->total )
vwindow->change_source(
@@
-195,7
+195,6
@@
int ClipPopupView::handle_event()
vwindow->change_source(
mwindow->session->drag_clips->values[0]);
vwindow->change_source(
mwindow->session->drag_clips->values[0]);
- vwindow->gui->unlock_window();
return 1;
}
return 1;
}