Mirrors/ScreenPlay
Mirrors/ScreenPlay
1
0
Fork 0
mirror of https://gitlab.com/kelteseth/ScreenPlay.git synced 2024-11-20 01:34:04 +01:00
Code Issues Projects Releases Activity

Fix missing relativePosition when we reset

Browse Source
This commit is contained in:
Elias Steurer 2024-07-29 10:26:26 +02:00
parent 0ad84736c0
commit 2f481e0846
2 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ScreenPlay/inc/public/ScreenPlay/screenplaytimelinemanager.h
View File

@ -24,7 +24,7 @@ public:
void startup(); void startup();
bool addTimelineFromSettings(const QJsonObject& timelineObj); bool addTimelineFromSettings(const QJsonObject& timelineObj);
bool deactivateCurrentTimeline(); bool deactivateCurrentTimeline();
bool moveTimelineAt(const int index, const QString identifier, const float relativePosition, QString positionTimeString); bool moveTimelineAt(const int index, const QString identifier, const float relativeLinePosition, QString positionTimeString);
bool startTimeline(); bool startTimeline();
bool addTimelineAt(const int index, const float reltiaveLinePosition, QString identifier); bool addTimelineAt(const int index, const float reltiaveLinePosition, QString identifier);
bool removeTimelineAt(const int index); bool removeTimelineAt(const int index);

5
ScreenPlay/src/screenplaytimelinemanager.cpp
View File

@ -296,10 +296,10 @@ void ScreenPlayTimelineManager::updateIndices()
timeline section. timeline section.
*/ */
bool ScreenPlayTimelineManager::addTimelineAt(const int index, const float reltiaveLinePosition, QString identifier) bool ScreenPlayTimelineManager::addTimelineAt(const int index, const float relativeLinePosition, QString identifier)
{ {
// We always get the new endTime // We always get the new endTime
const QString newStopPosition = Util().getTimeString(reltiaveLinePosition); const QString newStopPosition = Util().getTimeString(relativeLinePosition);
QTime newStopPositionTime = QTime::fromString(newStopPosition, m_timelineTimeFormat); QTime newStopPositionTime = QTime::fromString(newStopPosition, m_timelineTimeFormat);
if (!newStopPositionTime.isValid()) { if (!newStopPositionTime.isValid()) {
return false; return false;
@ -326,6 +326,7 @@ bool ScreenPlayTimelineManager::addTimelineAt(const int index, const float relti
newTimelineSection->settings = m_settings; newTimelineSection->settings = m_settings;
newTimelineSection->globalVariables = m_globalVariables; newTimelineSection->globalVariables = m_globalVariables;
newTimelineSection->index = index; newTimelineSection->index = index;
newTimelineSection->relativePosition = relativeLinePosition;
newTimelineSection->identifier = identifier; newTimelineSection->identifier = identifier;
newTimelineSection->endTime = newStopPositionTime; newTimelineSection->endTime = newStopPositionTime;
// In case we do a full reset, we must set the start time manually // In case we do a full reset, we must set the start time manually