WIP QOpenGLWindow investigation

darbyjohnston · Apr 22, 2024 · 8995b74 · 8995b74
1 parent bc2dec3
commit 8995b74
Show file tree

Hide file tree

Showing 7 changed files with 1,091 additions and 18 deletions.
diff --git a/lib/tlPlayQtApp/MainWindow.cpp b/lib/tlPlayQtApp/MainWindow.cpp
@@ -37,6 +37,7 @@
 #include <tlQtWidget/TimeSpinBox.h>
 #include <tlQtWidget/TimelineViewport.h>
 #include <tlQtWidget/TimelineWidget.h>
+#include <tlQtWidget/TimelineWindow.h>
 #include <tlQtWidget/Util.h>
 
 #if defined(TLRENDER_BMD)
@@ -93,7 +94,8 @@ namespace tl
             ToolActions* toolActions = nullptr;
 
             qtwidget::TimelineViewport* timelineViewport = nullptr;
-            qtwidget::TimelineWidget* timelineWidget = nullptr;
+            //qtwidget::TimelineWidget* timelineWidget = nullptr;
+            qtwidget::TimelineWindow* timelineWidget = nullptr;
             qtwidget::TimeSpinBox* currentTimeSpinBox = nullptr;
             QDoubleSpinBox* speedSpinBox = nullptr;
             QToolButton* speedButton = nullptr;
@@ -168,7 +170,7 @@ namespace tl
             auto context = app->getContext();
             p.timelineViewport = new qtwidget::TimelineViewport(context);
 
-            p.timelineWidget = new qtwidget::TimelineWidget(
+            p.timelineWidget = new qtwidget::TimelineWindow(
                 ui::Style::create(context),
                 app->timeUnitsModel(),
                 context);
@@ -278,7 +280,7 @@ namespace tl
             timelineDockWidget->setWindowTitle(tr("Timeline"));
             timelineDockWidget->setFeatures(QDockWidget::DockWidgetClosable);
             timelineDockWidget->setTitleBarWidget(new QWidget);
-            timelineDockWidget->setWidget(p.timelineWidget);
+            timelineDockWidget->setWidget(QWidget::createWindowContainer(p.timelineWidget));
             addDockWidget(Qt::BottomDockWidgetArea, timelineDockWidget);
 
             p.currentTimeSpinBox = new qtwidget::TimeSpinBox;
@@ -572,21 +574,21 @@ namespace tl
 
             connect(
                 p.timelineWidget,
-                &qtwidget::TimelineWidget::editableChanged,
+                &qtwidget::TimelineWindow::editableChanged,
                 [this](bool value)
                 {
                     _p->timelineActions->actions()["Editable"]->setChecked(value);
                 });
             connect(
                 p.timelineWidget,
-                &qtwidget::TimelineWidget::frameViewChanged,
+                &qtwidget::TimelineWindow::frameViewChanged,
                 [this](bool value)
                 {
                     _p->timelineActions->actions()["FrameView"]->setChecked(value);
                 });
             /*connect(
                 p.timelineWidget,
-                &qtwidget::TimelineWidget::timeScrubbed,
+                &qtwidget::TimelineWindow::timeScrubbed,
                 [this](const otime::RationalTime& value)
                 {
                     std::cout << "Time scrubbed: " << value << std::endl;
@@ -696,7 +698,7 @@ namespace tl
                 timelineItemOptions.markers);
         }
 
-        qtwidget::TimelineWidget* MainWindow::timelineWidget() const
+        qtwidget::TimelineWindow* MainWindow::timelineWidget() const
         {
             return _p->timelineWidget;
         }
@@ -820,7 +822,7 @@ namespace tl
 
             const auto& files = p.app->filesModel()->observeFiles()->get();
             const size_t count = files.size();
-            p.timelineWidget->setEnabled(count > 0);
+            //p.timelineWidget->setEnabled(count > 0);
             p.currentTimeSpinBox->setEnabled(count > 0);
             p.speedSpinBox->setEnabled(count > 0);
             p.volumeSlider->setEnabled(count > 0);

diff --git a/lib/tlPlayQtApp/MainWindow.h b/lib/tlPlayQtApp/MainWindow.h
@@ -12,7 +12,7 @@ namespace tl
 {
     namespace qtwidget
     {
-        class TimelineWidget;
+        class TimelineWindow;
         class TimelineViewport;
     }
 
@@ -30,10 +30,10 @@ namespace tl
 
             virtual ~MainWindow();
 
-            //! Get the timeline widget;
-            qtwidget::TimelineWidget* timelineWidget() const;
+            //! Get the timeline window.
+            qtwidget::TimelineWindow* timelineWidget() const;
 
-            //! Get the timeline viewport;
+            //! Get the timeline viewport.
             qtwidget::TimelineViewport* timelineViewport() const;
 
         protected:

diff --git a/lib/tlPlayQtApp/TimelineActions.cpp b/lib/tlPlayQtApp/TimelineActions.cpp
@@ -6,7 +6,7 @@
 
 #include <tlPlayQtApp/MainWindow.h>
 
-#include <tlQtWidget/TimelineWidget.h>
+#include <tlQtWidget/TimelineWindow.h>
 
 #include <tlQt/MetaTypes.h>
 #include <tlQt/TimeObject.h>

diff --git a/lib/tlQtWidget/CMakeLists.txt b/lib/tlQtWidget/CMakeLists.txt
@@ -17,6 +17,7 @@ set(HEADERS
     TimeSpinBox.h
     TimelineViewport.h
     TimelineWidget.h
+    TimelineWindow.h
     Util.h)
 set(PRIVATE_HEADERS
     BellowsPrivate.h)
@@ -41,6 +42,7 @@ set(SOURCE
     TimeSpinBox.cpp
     TimelineViewport.cpp
     TimelineWidget.cpp
+    TimelineWindow.cpp
     Util.cpp)
 
 if(TLRENDER_QT6)

diff --git a/lib/tlQtWidget/TimelineWidget.h b/lib/tlQtWidget/TimelineWidget.h
@@ -13,11 +13,6 @@
 
 namespace tl
 {
-    namespace timeline
-    {
-        class Player;
-    }
-
     namespace qtwidget
     {
         //! Timeline widget.