From d09e257523b725ad5369030541869a3929a4e3c1 Mon Sep 17 00:00:00 2001 From: itsmattkc <34096995+itsmattkc@users.noreply.github.com> Date: Fri, 17 Feb 2023 14:16:07 -0800 Subject: [PATCH 1/4] mainwindow: ensure timelines are actually tabified --- app/window/mainwindow/mainwindow.cpp | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/app/window/mainwindow/mainwindow.cpp b/app/window/mainwindow/mainwindow.cpp index e12a8ebe0..f718a1e3c 100644 --- a/app/window/mainwindow/mainwindow.cpp +++ b/app/window/mainwindow/mainwindow.cpp @@ -603,10 +603,15 @@ void MainWindow::FolderPanelCloseRequested() TimelinePanel* MainWindow::AppendTimelinePanel() { + TimelinePanel *previous = nullptr; + if (!timeline_panels_.empty()) { + previous = timeline_panels_.last(); + } + TimelinePanel* panel = AppendPanelInternal(QStringLiteral("TimelinePanel"), timeline_panels_); - if (timeline_panels_.size() > 1) { - timeline_panels_.last()->addDockWidgetAsTab(panel); + if (previous) { + previous->addDockWidgetAsTab(panel); } else { panel->SetSignalInsteadOfClose(false); } From 17867f0db5ef4cebaaf99b44cb02a431385eb69e Mon Sep 17 00:00:00 2001 From: itsmattkc <34096995+itsmattkc@users.noreply.github.com> Date: Mon, 20 Feb 2023 10:07:11 -0800 Subject: [PATCH 2/4] cmake: exclude submodules so they don't get installed --- ext/CMakeLists.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ext/CMakeLists.txt b/ext/CMakeLists.txt index cc819307a..135d557c3 100644 --- a/ext/CMakeLists.txt +++ b/ext/CMakeLists.txt @@ -14,8 +14,8 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see . -add_subdirectory(core) +add_subdirectory(core EXCLUDE_FROM_ALL) set(KDDockWidgets_STATIC ON CACHE INTERNAL "Force KDDockWidgets to build statically") set(KDDockWidgets_QT6 ${BUILD_QT6} CACHE INTERNAL "Conform KDDockWidgets' Qt 6 setting to ours") -add_subdirectory(KDDockWidgets) +add_subdirectory(KDDockWidgets EXCLUDE_FROM_ALL) From 2d83beb2c6ac80cb8f6ccc5b6995e0dab97db7f4 Mon Sep 17 00:00:00 2001 From: itsmattkc <34096995+itsmattkc@users.noreply.github.com> Date: Mon, 20 Feb 2023 14:56:57 -0800 Subject: [PATCH 3/4] mainwindowlayoutinfo: don't skip old versions --- app/window/mainwindow/mainwindowlayoutinfo.cpp | 1 - 1 file changed, 1 deletion(-) diff --git a/app/window/mainwindow/mainwindowlayoutinfo.cpp b/app/window/mainwindow/mainwindowlayoutinfo.cpp index a229fd386..4970f6433 100644 --- a/app/window/mainwindow/mainwindowlayoutinfo.cpp +++ b/app/window/mainwindow/mainwindowlayoutinfo.cpp @@ -74,7 +74,6 @@ MainWindowLayoutInfo MainWindowLayoutInfo::fromXml(QXmlStreamReader *reader, con // Really basic version checking, in the future we may use this to parse multiple versions if (file_version != kVersion) { - return info; } while (XMLReadNextStartElement(reader)) { From 5891b701379db904551254732001dc626251d746 Mon Sep 17 00:00:00 2001 From: itsmattkc <34096995+itsmattkc@users.noreply.github.com> Date: Tue, 21 Feb 2023 09:57:57 -0800 Subject: [PATCH 4/4] inputflag: rename IgnoreConnections to IgnoreInvalidations --- app/node/node.cpp | 6 +++--- app/node/output/track/track.cpp | 2 +- app/node/param.h | 2 +- app/node/project/sequence/sequence.cpp | 2 +- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/app/node/node.cpp b/app/node/node.cpp index 11803f124..60c951a0e 100644 --- a/app/node/node.cpp +++ b/app/node/node.cpp @@ -203,7 +203,7 @@ void Node::ConnectEdge(Node *output, const NodeInput &input) emit output->OutputConnected(output, input); // Invalidate all if this node isn't ignoring this input - if (!(input.node()->GetInputFlags(input.input()) & kInputFlagIgnoreConnections)) { + if (!(input.node()->GetInputFlags(input.input()) & kInputFlagIgnoreInvalidations)) { input.node()->InvalidateAll(input.input(), input.element()); } } @@ -230,7 +230,7 @@ void Node::DisconnectEdge(Node *output, const NodeInput &input) emit input.node()->InputDisconnected(output, input); emit output->OutputDisconnected(output, input); - if (!(input.node()->GetInputFlags(input.input()) & kInputFlagIgnoreConnections)) { + if (!(input.node()->GetInputFlags(input.input()) & kInputFlagIgnoreInvalidations)) { input.node()->InvalidateAll(input.input(), input.element()); } } @@ -1643,7 +1643,7 @@ void Node::ParameterValueChanged(const QString& input, int element, const TimeRa emit ValueChanged(NodeInput(this, input, element), range); - if (GetInputFlags(input) & kInputFlagIgnoreConnections) { + if (GetInputFlags(input) & kInputFlagIgnoreInvalidations) { return; } diff --git a/app/node/output/track/track.cpp b/app/node/output/track/track.cpp index 0f8feb8d3..3f2abe1c3 100644 --- a/app/node/output/track/track.cpp +++ b/app/node/output/track/track.cpp @@ -46,7 +46,7 @@ Track::Track() : locked_(false), sequence_(nullptr) { - AddInput(kBlockInput, NodeValue::kNone, InputFlags(kInputFlagArray | kInputFlagNotKeyframable | kInputFlagHidden | kInputFlagIgnoreConnections)); + AddInput(kBlockInput, NodeValue::kNone, InputFlags(kInputFlagArray | kInputFlagNotKeyframable | kInputFlagHidden | kInputFlagIgnoreInvalidations)); AddInput(kMutedInput, NodeValue::kBoolean, false, InputFlags(kInputFlagNotConnectable | kInputFlagNotKeyframable)); diff --git a/app/node/param.h b/app/node/param.h index 8c8949f20..ae3a804e8 100644 --- a/app/node/param.h +++ b/app/node/param.h @@ -37,7 +37,7 @@ enum InputFlag : uint64_t { kInputFlagNotKeyframable = 0x2, kInputFlagNotConnectable = 0x4, kInputFlagHidden = 0x8, - kInputFlagIgnoreConnections = 0x10, + kInputFlagIgnoreInvalidations = 0x10, kInputFlagStatic = kInputFlagNotKeyframable | kInputFlagNotConnectable }; diff --git a/app/node/project/sequence/sequence.cpp b/app/node/project/sequence/sequence.cpp index 0910e3b6f..c460d32c0 100644 --- a/app/node/project/sequence/sequence.cpp +++ b/app/node/project/sequence/sequence.cpp @@ -43,7 +43,7 @@ Sequence::Sequence() // Create track input QString track_input_id = kTrackInputFormat.arg(i); - AddInput(track_input_id, NodeValue::kNone, InputFlags(kInputFlagNotKeyframable | kInputFlagArray | kInputFlagHidden | kInputFlagIgnoreConnections)); + AddInput(track_input_id, NodeValue::kNone, InputFlags(kInputFlagNotKeyframable | kInputFlagArray | kInputFlagHidden | kInputFlagIgnoreInvalidations)); TrackList* list = new TrackList(this, static_cast(i), track_input_id); track_lists_.replace(i, list);