Merge pull request #208 from naivisoftware/sequencer_resizable_trackh…

…eights Sequencer update
napframework · Jul 22, 2022 · 52091e6 · 52091e6
2 parents 026a993 + 2972849
commit 52091e6
Show file tree

Hide file tree

Showing 68 changed files with 11,173 additions and 9,817 deletions.
diff --git a/modules/napimgui/data/subtract.png b/modules/napimgui/data/subtract.png
diff --git a/modules/napimgui/src/imguiservice.cpp b/modules/napimgui/src/imguiservice.cpp
@@ -95,7 +95,8 @@ namespace nap
 				icon::edit,
 				icon::remove,
 				icon::add,
-				icon::change
+				icon::change,
+                icon::subtract
 			};
 			return map;
 		}

diff --git a/modules/napimgui/src/imguiservice.h b/modules/napimgui/src/imguiservice.h
@@ -60,6 +60,7 @@ namespace nap
 		inline constexpr const char* remove		= "remove.png";
 		inline constexpr const char* add		= "add.png";
 		inline constexpr const char* change		= "change.png";
+        inline constexpr const char* subtract	= "subtract.png";
 	}
 
 

diff --git a/modules/napsequence/src/sequence.cpp b/modules/napsequence/src/sequence.cpp
@@ -6,9 +6,9 @@
 #include "sequence.h"
 
 RTTI_BEGIN_CLASS(nap::Sequence)
-    RTTI_PROPERTY("Sequence Tracks", &nap::Sequence::mTracks, nap::rtti::EPropertyMetaData::Embedded)
-    RTTI_PROPERTY("Sequence Markers", &nap::Sequence::mMarkers, nap::rtti::EPropertyMetaData::Embedded)
-    RTTI_PROPERTY("Duration", &nap::Sequence::mDuration, nap::rtti::EPropertyMetaData::Default)
+        RTTI_PROPERTY("Sequence Tracks", &nap::Sequence::mTracks, nap::rtti::EPropertyMetaData::Embedded)
+        RTTI_PROPERTY("Sequence Markers", &nap::Sequence::mMarkers, nap::rtti::EPropertyMetaData::Embedded)
+        RTTI_PROPERTY("Duration", &nap::Sequence::mDuration, nap::rtti::EPropertyMetaData::Default)
 RTTI_END_CLASS
 
 //////////////////////////////////////////////////////////////////////////

diff --git a/modules/napsequence/src/sequence.h b/modules/napsequence/src/sequence.h
@@ -21,7 +21,7 @@ namespace nap
      */
     class NAPAPI Sequence : public Resource
     {
-        RTTI_ENABLE(Resource)
+    RTTI_ENABLE(Resource)
     public:
         std::vector<ResourcePtr<SequenceTrack>> mTracks; ///< Property: 'Sequence Tracks' Vector holding resourceptrs to the SequenceTracks
         std::vector<ResourcePtr<SequenceMarker>> mMarkers; ///< Property: 'Sequence Markers' Vector holding resourceptrs to the SequenceMarkers