From 91ae2ecc44450b919bc2532d768a255e8731440b Mon Sep 17 00:00:00 2001 From: Thomas Wilshaw Date: Mon, 16 Aug 2021 21:29:45 +0100 Subject: [PATCH] Make sure either clips are selected or markers are selected, never both. --- app/widget/marker/marker.cpp | 4 ++++ app/widget/timelinewidget/tool/pointer.cpp | 2 ++ 2 files changed, 6 insertions(+) diff --git a/app/widget/marker/marker.cpp b/app/widget/marker/marker.cpp index 985d15b94..255a7934c 100644 --- a/app/widget/marker/marker.cpp +++ b/app/widget/marker/marker.cpp @@ -27,6 +27,7 @@ #include "widget/menu/menu.h" #include "widget/menu/menushared.h" #include "widget/timeruler/seekablewidget.h" +#include "widget/timelinewidget/timelinewidget.h" namespace olive { @@ -108,6 +109,9 @@ void Marker::mousePressEvent(QMouseEvent* e) update(); } + + // Feels very hacky, might it be better to write some access methods? + static_cast(parent()->parent())->DeselectAll(); } void Marker::ShowContextMenu() { diff --git a/app/widget/timelinewidget/tool/pointer.cpp b/app/widget/timelinewidget/tool/pointer.cpp index 1ea1ba703..e29cd4fd4 100644 --- a/app/widget/timelinewidget/tool/pointer.cpp +++ b/app/widget/timelinewidget/tool/pointer.cpp @@ -135,6 +135,8 @@ void PointerTool::MousePress(TimelineViewMouseEvent *event) if (can_rubberband_select_) { drag_global_start_ = QCursor::pos(); } + + parent()->ruler()->DeselectAllMarkers(); } void PointerTool::MouseMove(TimelineViewMouseEvent *event)