Skip to content

Commit

Permalink
Adding "experimental_timeline" debug preference, to allow for conditi…
Browse files Browse the repository at this point in the history
…onal testing of a non-webview timeline widget. For now though, it's a blank QWidget.
  • Loading branch information
jonoomph committed Feb 12, 2024
1 parent a62f223 commit 187c8bf
Show file tree
Hide file tree
Showing 2 changed files with 14 additions and 2 deletions.
8 changes: 8 additions & 0 deletions src/settings/_default.settings
Original file line number Diff line number Diff line change
Expand Up @@ -378,6 +378,14 @@
"category": "Debug",
"setting": "send_metrics"
},
{
"value": false,
"title": "Use Experimental Timeline (not recommended)",
"type": "bool",
"category": "Debug",
"setting": "experimental_timeline",
"restart": true
},
{
"value": true,
"title": "Show Export Dialog when Finished",
Expand Down
8 changes: 6 additions & 2 deletions src/windows/main_window.py
Original file line number Diff line number Diff line change
Expand Up @@ -1020,7 +1020,8 @@ def actionPreview_File_trigger(self, checked=True):
def movePlayhead(self, position_frames):
"""Update playhead position"""
# Notify preview thread
self.timeline.movePlayhead(position_frames)
if hasattr(self.timeline, 'movePlayhead'):
self.timeline.movePlayhead(position_frames)

def SetPlayheadFollow(self, enable_follow):
""" Enable / Disable follow mode """
Expand Down Expand Up @@ -3248,7 +3249,10 @@ def __init__(self, *args):
self.timeline_sync = TimelineSync(self)

# Setup timeline
self.timeline = TimelineWebView(self)
if s.get("experimental_timeline"):
self.timeline = QWidget(self)
else:
self.timeline = TimelineWebView(self)
self.frameWeb.layout().addWidget(self.timeline)

# Configure the side docks to full-height
Expand Down

0 comments on commit 187c8bf

Please sign in to comment.