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

fixed timeline getting stuck resizing tracks on slip tool

Browse Source
This commit is contained in:
itsmattkc
2018-11-14 09:00:24 +11:00
parent 6a38cd05ae
commit a7618da329
3 changed files with 4 additions and 4435 deletions
Download Patch File Download Diff File Expand all files Collapse all files
.gitignore
+1
View File
@@ -1 +1,2 @@
*.pro.user*
Makefile
Makefile
-4432
View File
File diff suppressed because it is too large Load Diff
ui/timelinewidget.cpp
+2 -2
View File
@@ -1380,6 +1380,8 @@ void TimelineWidget::mouseMoveEvent(QMouseEvent *event) {
panel_timeline->move_insert = ((event->modifiers() & Qt::ControlModifier) && (panel_timeline->tool == TIMELINE_TOOL_POINTER || panel_timeline->importing || panel_timeline->creating));
if (!panel_timeline->moving_init) track_resizing = false;
if (isLiveEditing()) {
panel_timeline->snap_to_timeline(&panel_timeline->cursor_frame, !config.edit_tool_also_seeks || !panel_timeline->selecting, true, true);
}
@@ -1740,8 +1742,6 @@ void TimelineWidget::mouseMoveEvent(QMouseEvent *event) {
} else if (panel_timeline->tool == TIMELINE_TOOL_POINTER ||
panel_timeline->tool == TIMELINE_TOOL_RIPPLE ||
panel_timeline->tool == TIMELINE_TOOL_ROLLING) {
track_resizing = false;
QToolTip::hideText();
QPoint pos = event->pos();