diff --git a/src/stage/timeline/track-body.hpp b/src/stage/timeline/track-body.hpp index b14087e61..16ebbe770 100644 --- a/src/stage/timeline/track-body.hpp +++ b/src/stage/timeline/track-body.hpp @@ -121,7 +121,9 @@ namespace timeline { void accommodateContentHeight(uint contentExtension); uint DEBUGconH() const { return contentHeight_;}////////////////////////////////////TODO - uint getContentOffsetY() { return startLine_ + contentOffset_; } + uint getContentOffsetY() const { return startLine_ + contentOffset_; } + uint getOwnContentHeight() const { return contentOffset_ + contentHeight_ + + decoration.content - decoration.trackPad; } DisplayManager::SignalStructureChange signalStructureChange_; diff --git a/src/stage/timeline/track-head-widget.cpp b/src/stage/timeline/track-head-widget.cpp index 6de758140..f308cc664 100644 --- a/src/stage/timeline/track-head-widget.cpp +++ b/src/stage/timeline/track-head-widget.cpp @@ -163,6 +163,21 @@ cout<<"|+| Head:inc ("< localHeight) + enforceSyncPadHeight (directHeight - localHeight); + } + /** diff --git a/src/stage/timeline/track-head-widget.hpp b/src/stage/timeline/track-head-widget.hpp index d21f8ca15..37cf2d374 100644 --- a/src/stage/timeline/track-head-widget.hpp +++ b/src/stage/timeline/track-head-widget.hpp @@ -107,6 +107,7 @@ namespace timeline { void accommodateContentHeight(uint); void accommodateOverallHeight(uint); + void syncSubtrackStartHeight (uint); private:/* ===== Internals ===== */ @@ -126,6 +127,7 @@ namespace timeline { uint getLabelHeight() const { return getHeightAt (0,0); }; void enforceContentHeight (uint h){ enforceHeightAt (1,1, h); } + void enforceSyncPadHeight (uint h){ enforceHeightAt (1,2, h); } void enforceExpansionHeight(uint h){ enforceHeightAt (0,1, h); } }; diff --git a/src/stage/timeline/track-presenter.hpp b/src/stage/timeline/track-presenter.hpp index 65b1a3b16..57a14656d 100644 --- a/src/stage/timeline/track-presenter.hpp +++ b/src/stage/timeline/track-presenter.hpp @@ -513,13 +513,15 @@ cout<<"|*| establishExtension(clipH="< - + @@ -29320,14 +29320,137 @@ - - + + + + + + + + +

+ ...und zwar über den contentOffset, der relativ zur Start-Zeile gemessen wird, sowie der direkten ContentHeight, zuzüglich Padding +

+ +
+
- + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +

+ das Präludium gehört nicht zum Track, und für alle sonstigen Größenangaben gilt ein unmittelbarer Bezug auf die Canvas-Koordinaten; diese gelten lokal für den Canvas +

+ +
+ +
+ + + + + + + + + + + + + + + + + +
+ + + +