From af6cb35cde6243df624543084bbc3ee3c0d600f7 Mon Sep 17 00:00:00 2001
From: itsmattkc <34096995+itsmattkc@users.noreply.github.com>
Date: Sat, 27 Aug 2022 09:26:07 -0700
Subject: [PATCH] timeline: use better system of identifying ruler focus

---
 app/widget/timebased/timebasedwidget.cpp     | 2 +-
 app/widget/timelinewidget/timelinewidget.cpp | 2 +-
 app/widget/timeruler/seekablewidget.h        | 5 +++++
 3 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/app/widget/timebased/timebasedwidget.cpp b/app/widget/timebased/timebasedwidget.cpp
index 03f0111c9..a4beb3bfa 100644
--- a/app/widget/timebased/timebasedwidget.cpp
+++ b/app/widget/timebased/timebasedwidget.cpp
@@ -741,7 +741,7 @@ void TimeBasedWidget::GoToOut()
 
 void TimeBasedWidget::DeleteSelected()
 {
-  if (ruler_->underMouse()) {
+  if (ruler_->HasItemsSelected()) {
     ruler_->DeleteSelected();
   }
 }
diff --git a/app/widget/timelinewidget/timelinewidget.cpp b/app/widget/timelinewidget/timelinewidget.cpp
index 31312764d..2367132be 100644
--- a/app/widget/timelinewidget/timelinewidget.cpp
+++ b/app/widget/timelinewidget/timelinewidget.cpp
@@ -441,7 +441,7 @@ void TimelineWidget::ReplaceBlocksWithGaps(const QVector<Block *> &blocks,
 
 void TimelineWidget::DeleteSelected(bool ripple)
 {
-  if (ruler()->hasFocus()) {
+  if (ruler()->HasItemsSelected()) {
     ruler()->DeleteSelected();
     return;
   }
diff --git a/app/widget/timeruler/seekablewidget.h b/app/widget/timeruler/seekablewidget.h
index fadf13492..ef90f872e 100644
--- a/app/widget/timeruler/seekablewidget.h
+++ b/app/widget/timeruler/seekablewidget.h
@@ -65,6 +65,11 @@ public:
 
   void SeekToScenePoint(qreal scene);
 
+  bool HasItemsSelected() const
+  {
+    return !selection_manager_.GetSelectedObjects().empty();
+  }
+
   const std::vector<TimelineMarker*> &GetSelectedMarkers() const
   {
     return selection_manager_.GetSelectedObjects();