projects
/
goodguy
/
cinelerra.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
copy/paste behavior tweaks
[goodguy/cinelerra.git]
/
cinelerra-5.1
/
cinelerra
/
editpanel.C
diff --git
a/cinelerra-5.1/cinelerra/editpanel.C
b/cinelerra-5.1/cinelerra/editpanel.C
index b539bda46f1a0ba84cbac969180259a543569001..26e5b7d071115c80ac91d206a01249afe03499d8 100644
(file)
--- a/
cinelerra-5.1/cinelerra/editpanel.C
+++ b/
cinelerra-5.1/cinelerra/editpanel.C
@@
-440,7
+440,7
@@
void EditPanel::set_position(double position)
edl->local_session->set_selectionend(position);
mwindow->gui->lock_window();
mwindow->find_cursor();
edl->local_session->set_selectionend(position);
mwindow->gui->lock_window();
mwindow->find_cursor();
- mwindow->gui->update(1,
1
, 1, 1, 1, 1, 0);
+ mwindow->gui->update(1,
NORMAL_DRAW
, 1, 1, 1, 1, 0);
mwindow->gui->unlock_window();
mwindow->cwindow->update(1, 0, 0, 0, 0);
}
mwindow->gui->unlock_window();
mwindow->cwindow->update(1, 0, 0, 0, 0);
}
@@
-933,7
+933,7
@@
int EditSplice::handle_event()
int EditSplice::keypress_event()
{
if( alt_down() ) return 0;
int EditSplice::keypress_event()
{
if( alt_down() ) return 0;
- if(
get_keypress() == 'v'
||
+ if(
(get_keypress() == 'v' && !ctrl_down())
||
(panel->is_vwindow() && get_keypress() == 'V') ) {
handle_event();
return 1;
(panel->is_vwindow() && get_keypress() == 'V') ) {
handle_event();
return 1;
@@
-1065,7
+1065,7
@@
EditCopy::~EditCopy()
int EditCopy::keypress_event()
{
if( alt_down() ) return 0;
int EditCopy::keypress_event()
{
if( alt_down() ) return 0;
- if(
get_keypress() == 'c'
||
+ if(
(get_keypress() == 'c' && !ctrl_down())
||
(panel->is_vwindow() && get_keypress() == 'C') ) {
return handle_event();
}
(panel->is_vwindow() && get_keypress() == 'C') ) {
return handle_event();
}
@@
-1127,7
+1127,7
@@
EditPaste::~EditPaste()
int EditPaste::keypress_event()
{
int EditPaste::keypress_event()
{
- if( get_keypress() == 'v' )
+ if( get_keypress() == 'v'
&& !ctrl_down()
)
return handle_event();
return 0;
}
return handle_event();
return 0;
}