aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJean-Baptiste Mardelle <[email protected]>2015-11-22 18:13:07 +0100
committerJean-Baptiste Mardelle <[email protected]>2015-11-22 18:13:07 +0100
commitf8409bb1bf6c89172501f199288476e9debe711a (patch)
treeadaffaf337bd680db3cca25e4902968eb17721d7
parent00b82e517919e71cf83a886db993a4ac93e66357 (diff)
Make Home/End shortcut work on transitions, don't focus clip monitor when dragging a clip from bin to timeline
-rw-r--r--src/bin/bin.cpp2
-rw-r--r--src/timeline/customtrackview.cpp6
2 files changed, 7 insertions, 1 deletions
diff --git a/src/bin/bin.cpp b/src/bin/bin.cpp
index ebf5696..7871e22 100644
--- a/src/bin/bin.cpp
+++ b/src/bin/bin.cpp
@@ -448,7 +448,7 @@ Bin::~Bin()
bool Bin::eventFilter(QObject *obj, QEvent *event)
{
- if (event->type() == QEvent::MouseButtonPress) {
+ if (event->type() == QEvent::MouseButtonRelease) {
m_monitor->slotActivateMonitor();
bool success = QWidget::eventFilter(obj, event);
if (m_gainedFocus) {
diff --git a/src/timeline/customtrackview.cpp b/src/timeline/customtrackview.cpp
index 8f7ab52..d8aef5a 100644
--- a/src/timeline/customtrackview.cpp
+++ b/src/timeline/customtrackview.cpp
@@ -5483,6 +5483,9 @@ void CustomTrackView::slotSeekToNextSnap()
void CustomTrackView::clipStart()
{
AbstractClipItem *item = getMainActiveClip();
+ if (item == NULL) {
+ item = m_dragItem;
+ }
if (item != NULL) {
seekCursorPos((int) item->startPos().frames(m_document->fps()));
checkScrolling();
@@ -5492,6 +5495,9 @@ void CustomTrackView::clipStart()
void CustomTrackView::clipEnd()
{
AbstractClipItem *item = getMainActiveClip();
+ if (item == NULL) {
+ item = m_dragItem;
+ }
if (item != NULL) {
seekCursorPos((int) item->endPos().frames(m_document->fps()) - 1);
checkScrolling();