projects
/
goodguy
/
history.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
add 'v' shortcut in resource wdw, sams proxy icons, update shortcuts doc
[goodguy/history.git]
/
cinelerra-5.1
/
cinelerra
/
mwindowedit.C
diff --git
a/cinelerra-5.1/cinelerra/mwindowedit.C
b/cinelerra-5.1/cinelerra/mwindowedit.C
index 53cb4c338e00a42faf6309ff531b57b76dc8ed9f..78b35f42acaa56c17830f78a387ed66f507297ca 100644
(file)
--- a/
cinelerra-5.1/cinelerra/mwindowedit.C
+++ b/
cinelerra-5.1/cinelerra/mwindowedit.C
@@
-1881,6
+1881,7
@@
void MWindow::redo_entry(BC_WindowBase *calling_window_gui)
update_plugin_guis();
gui->update(1, 2, 1, 1, 1, 1, 1);
update_plugin_guis();
gui->update(1, 2, 1, 1, 1, 1, 1);
+ gui->update_proxy_toggle();
gui->unlock_window();
cwindow->update(1, 1, 1, 1, 1);
cwindow->gui->unlock_window();
gui->unlock_window();
cwindow->update(1, 1, 1, 1, 1);
cwindow->gui->unlock_window();
@@
-1893,9
+1894,6
@@
void MWindow::redo_entry(BC_WindowBase *calling_window_gui)
}
}
}
}
- if( calling_window_gui != gui )
- gui->unlock_window();
-
awindow->gui->async_update_assets();
cwindow->refresh_frame(CHANGE_ALL);
awindow->gui->async_update_assets();
cwindow->refresh_frame(CHANGE_ALL);
@@
-2209,6
+2207,7
@@
void MWindow::undo_entry(BC_WindowBase *calling_window_gui)
update_plugin_guis();
gui->update(1, 2, 1, 1, 1, 1, 1);
update_plugin_guis();
gui->update(1, 2, 1, 1, 1, 1, 1);
+ gui->update_proxy_toggle();
gui->unlock_window();
cwindow->update(1, 1, 1, 1, 1);
cwindow->gui->unlock_window();
gui->unlock_window();
cwindow->update(1, 1, 1, 1, 1);
cwindow->gui->unlock_window();
@@
-2221,9
+2220,6
@@
void MWindow::undo_entry(BC_WindowBase *calling_window_gui)
}
}
}
}
- if( calling_window_gui != gui )
- gui->unlock_window();
-
awindow->gui->async_update_assets();
cwindow->refresh_frame(CHANGE_ALL);
awindow->gui->async_update_assets();
cwindow->refresh_frame(CHANGE_ALL);
@@
-2246,6
+2242,11
@@
void MWindow::delete_folder(char *folder)
void MWindow::select_point(double position)
{
void MWindow::select_point(double position)
{
+ gui->unlock_window();
+ gui->stop_drawing();
+ cwindow->stop_playback(0);
+ gui->lock_window("MWindow::select_point");
+
edl->local_session->set_selectionstart(position);
edl->local_session->set_selectionend(position);
edl->local_session->set_selectionstart(position);
edl->local_session->set_selectionend(position);