oak-team/oak-editor
3
1
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/olive-editor/olive

Browse Source
This commit is contained in:
itsmattkc
2018-12-30 23:39:59 +11:00
parent 9fd11c0f98 7e3f245962
commit bcdbc024ad
2 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
panels/effectcontrols.cpp
+1 -1
View File
@@ -111,9 +111,9 @@ void EffectControls::copy(bool del) {
Effect* effect = c->effects.at(j); Effect* effect = c->effects.at(j);
if (effect->container->selected) { if (effect->container->selected) {
if (!cleared) { if (!cleared) {
clipboard_type = CLIPBOARD_TYPE_EFFECT;
clear_clipboard(); clear_clipboard();
cleared = true; cleared = true;
clipboard_type = CLIPBOARD_TYPE_EFFECT;
} }
clipboard.append(effect->copy(NULL)); clipboard.append(effect->copy(NULL));
ui/timelinewidget.cpp
+4 -2
View File
@@ -1283,8 +1283,10 @@ void TimelineWidget::update_ghosts(const QPoint& mouse_pos, bool lock_frame) {
if (validator < 1) frame_diff -= (1 - validator); if (validator < 1) frame_diff -= (1 - validator);
// prevent timeline in from going below 0 // prevent timeline in from going below 0
validator = g.old_in + frame_diff; if (panel_timeline->tool != TIMELINE_TOOL_RIPPLE) {
if (validator < 0) frame_diff -= validator; validator = g.old_in + frame_diff;
if (validator < 0) frame_diff -= validator;
}
// prevent clip_in from going below 0 // prevent clip_in from going below 0
if (c->media->get_type() == MEDIA_TYPE_SEQUENCE if (c->media->get_type() == MEDIA_TYPE_SEQUENCE