From 4887194589cab11b79345697f1822083fae4e24a Mon Sep 17 00:00:00 2001 From: Ichthyostega Date: Thu, 19 Jan 2023 23:58:42 +0100 Subject: [PATCH] Timeline: investigate vertical space allocation on nested tracks ...seemingly the allocation of grid cells in the `TrackHeadWidget` is not quite correct yet: even when there are nested sub-tracks, we always need another row to hold the controls corresponding to the track itself and the whole scope. And this row is also what should be adjusted to match the vertical extension of the content area. As it turns out, the whole topic how to handle collapsed tracks was not even considered yet; the calculation of the "track profile" would need to be reworked to accommodate collapsed tracks, see: #1265 --- src/stage/timeline/track-head-widget.cpp | 26 +-- src/stage/timeline/track-presenter.hpp | 4 +- .../session/dummy-session-connection.cpp | 8 +- wiki/thinkPad.ichthyo.mm | 162 ++++++++++++++---- 4 files changed, 155 insertions(+), 45 deletions(-) diff --git a/src/stage/timeline/track-head-widget.cpp b/src/stage/timeline/track-head-widget.cpp index d5aa64f48..2e25a6b20 100644 --- a/src/stage/timeline/track-head-widget.cpp +++ b/src/stage/timeline/track-head-widget.cpp @@ -185,19 +185,22 @@ cout<<"|+| Head:inc ("<attach (subForkHead, 1, childCnt_, 1,1); + ++childCnt_; // left,top + Gtk::Grid::attach (subForkHead, 1, 1+childCnt_, 1,1); + // expand the structure display column.... + Gtk::Grid::remove (treeTODO_); // width,height + Gtk::Grid::attach (treeTODO_, 0,1, 1, 1+childCnt_); } /** @@ -215,7 +218,9 @@ cout<<"|+| Head:inc ("< 0) { - this->remove_row (childCnt_); + Gtk::Grid::remove_row (childCnt_); --childCnt_; } - attachDirectContent(); + Gtk::Grid::attach (treeTODO_, 0,1, 1,1); } diff --git a/src/stage/timeline/track-presenter.hpp b/src/stage/timeline/track-presenter.hpp index 153fdfc62..cb719dfcb 100644 --- a/src/stage/timeline/track-presenter.hpp +++ b/src/stage/timeline/track-presenter.hpp @@ -515,9 +515,11 @@ cout<<"|*| establishExtension(clipH="< - + @@ -25721,7 +25721,7 @@ - + @@ -25732,6 +25732,19 @@

+ +
+ + + + + + +

+ Ende 2022 habe ich dann doch noch das ElementBoxWidget gebaut. Nun verwenden Clips schon mal dieses, aber die ganze Logik der Clip-Anzeige ist auf später verschoben... +

+ +
@@ -26829,6 +26842,10 @@
+ + + + @@ -27744,8 +27761,14 @@ + + + + - + + + @@ -27759,7 +27782,8 @@ - + + @@ -27773,7 +27797,7 @@ - + @@ -29164,6 +29188,48 @@ + + + + + + + + + + + + + + + + + + + + + + + +

+ Jeder Track kann 0...N Ruler haben (Ruler = horizontale Scala); +

+
    +
  • + einer von diesen ist der »scope ruler« +
  • +
  • + er ersetzt den Track und den gesamten Scope der sub-Tracks in der Präsentation +
  • +
+ +
+ +
+ + + +
@@ -29811,9 +29877,11 @@ - + + - + + @@ -29828,6 +29896,7 @@ + @@ -29919,7 +29988,7 @@ - + @@ -31548,7 +31617,6 @@ - @@ -31587,16 +31655,15 @@ - - + + - - + @@ -43389,8 +43456,8 @@ - - + + @@ -43469,7 +43536,8 @@ - + + @@ -43483,9 +43551,13 @@ + + + - + + @@ -43493,9 +43565,9 @@ - - - + + + @@ -43505,8 +43577,8 @@ - - + + @@ -43649,8 +43721,8 @@ - - + + @@ -43664,7 +43736,7 @@ - + @@ -43734,7 +43806,7 @@ - + @@ -43747,7 +43819,7 @@ - + @@ -43841,7 +43913,7 @@ - + @@ -43888,8 +43960,8 @@ - - + + @@ -64670,6 +64742,36 @@ + + + + + + + + + + + + + + +

+ 1/2023: unklar — wer macht das? +

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