[ui] Auto-scroll improvements

ossia · Feb 12, 2022 · 00c8b3e · 00c8b3e
1 parent 962d0a2
commit 00c8b3e
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 5 deletions.
diff --git a/src/plugins/score-plugin-packagemanager/PackageManager/View.cpp b/src/plugins/score-plugin-packagemanager/PackageManager/View.cpp
@@ -182,7 +182,7 @@ void PluginSettingsView::handleAddon(const QJsonObject& obj)
   RemotePackagesModel* model
       = static_cast<RemotePackagesModel*>(m_remoteAddons->model());
 
-  if (m_addonsToRetrieve == model->m_vec.size())
+  if (m_addonsToRetrieve == std::ssize(model->m_vec))
   {
     reset_progress();
   }

diff --git a/src/plugins/score-plugin-scenario/Scenario/Document/Interval/IntervalDurations.cpp b/src/plugins/score-plugin-scenario/Scenario/Document/Interval/IntervalDurations.cpp
@@ -108,10 +108,12 @@ void IntervalDurations::setPlayPercentage(double arg)
 
   auto old = m_playPercentage;
 
+  m_playPercentage = arg;
+
+  // Only used for DurationSectionWidget
   if (m_defaultDuration * std::abs(arg - old)
-      > TimeVal{std::chrono::milliseconds(16)})
+      > TimeVal{std::chrono::milliseconds(32)})
   {
-    m_playPercentage = arg;
     playPercentageChanged(arg);
   }
 }

diff --git a/...ns/score-plugin-scenario/Scenario/Document/ScenarioDocument/ScenarioDocumentPresenter.cpp b/...ns/score-plugin-scenario/Scenario/Document/ScenarioDocument/ScenarioDocumentPresenter.cpp
@@ -798,7 +798,7 @@ void ScenarioDocumentPresenter::on_executionTimer()
   else if(auto i = std::get_if<CentralIntervalDisplay>(&this->m_centralDisplay))
   {
     if(m_autoScroll)
-    autoScroll();
+      autoScroll();
   }
 }
 
@@ -822,7 +822,18 @@ void ScenarioDocumentPresenter::autoScroll()
 
   auto& dur = sel_itv->duration;
   auto delta = Scenario::timeDelta(sel_itv, &root);
-  double exec_d = dur.playPercentage() * (delta + dur.defaultDuration()).toPixels(this->m_zoomRatio);
+  auto visible_play_percentage = [&] {
+    if(dur.isMaxInfinite())
+    {
+      return std::min(dur.playPercentage(), 1.);
+    }
+    else
+    {
+      return dur.playPercentage();
+    }
+  };
+
+  double exec_d = visible_play_percentage() * (delta + dur.defaultDuration()).toPixels(this->m_zoomRatio);
   auto center = view().view().visibleRect().center();
   view().view().ensureVisible({exec_d - 100, center.y() - 10, view().viewWidth() / 2., 20});
 }