From 33f299e45f798f0dbdd7e43512faee9809b4b6c9 Mon Sep 17 00:00:00 2001
From: Ichthyostega <prg@ichthyostega.de>
Date: Sat, 29 Feb 2020 00:24:22 +0100
Subject: [PATCH] Relative-Hook: observe CSS padding and margin
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

and voilà: now the placeholder buttons appear nicely within
the content area of each track
---
 src/stage/timeline/body-canvas-widget.cpp |  3 ++
 src/stage/timeline/track-body.cpp         |  4 +-
 src/stage/timeline/track-body.hpp         |  1 +
 wiki/thinkPad.ichthyo.mm                  | 59 +++++++++++++++++------
 4 files changed, 50 insertions(+), 17 deletions(-)

diff --git a/src/stage/timeline/body-canvas-widget.cpp b/src/stage/timeline/body-canvas-widget.cpp
index 3d4edb177..c972772ef 100644
--- a/src/stage/timeline/body-canvas-widget.cpp
+++ b/src/stage/timeline/body-canvas-widget.cpp
@@ -117,6 +117,9 @@ namespace timeline {
                                     + styleBody->get_padding().get_top()
                                     + styleBody->get_padding().get_bottom()
                                     ;
+      TrackBody::decoration.trackPad = styleBody->get_margin().get_top()
+                                     + styleBody->get_padding().get_top()
+                                     ;
       TrackBody::decoration.topMar = styleBody->get_margin().get_top();
       TrackBody::decoration.botMar = styleBody->get_margin().get_bottom();
       
diff --git a/src/stage/timeline/track-body.cpp b/src/stage/timeline/track-body.cpp
index 1aff643c3..6b1d051d2 100644
--- a/src/stage/timeline/track-body.cpp
+++ b/src/stage/timeline/track-body.cpp
@@ -228,8 +228,8 @@ namespace timeline {
         // which thus needs to use adjusted coordinates for widgets.
         line = 0;
       }
-    // mark offset of the content area relative to this track's top
-    this->contentOffset_ = line;
+    // mark offset of the actual content area relative to this track's top
+    this->contentOffset_ = line + decoration.trackPad;
     
     // allocate space for the track content
     line += this->contentHeight_ + decoration.content;
diff --git a/src/stage/timeline/track-body.hpp b/src/stage/timeline/track-body.hpp
index 0c8a249af..e80a7c81b 100644
--- a/src/stage/timeline/track-body.hpp
+++ b/src/stage/timeline/track-body.hpp
@@ -73,6 +73,7 @@ namespace timeline {
       uint ruler  = 0;
       uint topMar = 0;
       uint botMar = 0;
+      uint trackPad = 0;
       
       using Borders = std::array<uint, 6>;
       Borders borders{0,0,0,0,0,0};    ///< width of up to 6 levels of combined upward slope borders (defined in CSS)
diff --git a/wiki/thinkPad.ichthyo.mm b/wiki/thinkPad.ichthyo.mm
index 0736e161a..af0fea1e3 100644
--- a/wiki/thinkPad.ichthyo.mm
+++ b/wiki/thinkPad.ichthyo.mm
@@ -16721,7 +16721,7 @@
 <node CREATED="1488566356774" ID="ID_969011841" MODIFIED="1557498707220" TEXT="Ankerpunkt zum Bilden der Commands">
 <arrowlink COLOR="#706a9a" DESTINATION="ID_1461875887" ENDARROW="Default" ENDINCLINATION="-923;-789;" ID="Arrow_ID_457540370" STARTARROW="None" STARTINCLINATION="806;300;"/>
 <node CREATED="1488566405248" ID="ID_355508260" MODIFIED="1557498707220" TEXT="auffinden der Command-IDs">
-<node CREATED="1489191528425" ID="ID_1331796226" MODIFIED="1566956320222" TEXT="Neuer Service hierf&#xfc;r in Proc">
+<node CREATED="1489191528425" ID="ID_1331796226" MODIFIED="1582931241668" TEXT="Neuer Service hierf&#xfc;r in Proc">
 <arrowlink COLOR="#584d79" DESTINATION="ID_341428100" ENDARROW="Default" ENDINCLINATION="1995;-1317;" ID="Arrow_ID_879741123" STARTARROW="None" STARTINCLINATION="334;-13;"/>
 </node>
 <node BACKGROUND_COLOR="#eee5c3" COLOR="#990000" CREATED="1488677809297" ID="ID_1520540731" MODIFIED="1557498707220" TEXT="Problem: Zugang / Wiring">
@@ -20880,9 +20880,9 @@
 <icon BUILTIN="button_ok"/>
 <node COLOR="#338800" CREATED="1561036914961" ID="ID_318008470" MODIFIED="1561042586692" TEXT="der DisplayManager tr&#xe4;gt das &quot;Anker&quot;-Signal">
 <icon BUILTIN="button_ok"/>
-<node COLOR="#435e98" CREATED="1561036987264" ID="ID_1799554074" MODIFIED="1575131530100" TEXT="signalStructureChange">
+<node COLOR="#435e98" CREATED="1561036987264" ID="ID_1799554074" MODIFIED="1582931247838" TEXT="signalStructureChange">
 <linktarget COLOR="#a9b4c1" DESTINATION="ID_1799554074" ENDARROW="Default" ENDINCLINATION="93;0;" ID="Arrow_ID_576839005" SOURCE="ID_1490359824" STARTARROW="None" STARTINCLINATION="169;0;"/>
-<linktarget COLOR="#8db7cd" DESTINATION="ID_1799554074" ENDARROW="Default" ENDINCLINATION="598;258;" ID="Arrow_ID_1531606207" SOURCE="ID_833580972" STARTARROW="None" STARTINCLINATION="411;28;"/>
+<linktarget COLOR="#8db7cd" DESTINATION="ID_1799554074" ENDARROW="Default" ENDINCLINATION="598;258;" ID="Arrow_ID_1531606207" SOURCE="ID_833580972" STARTARROW="None" STARTINCLINATION="455;26;"/>
 <linktarget COLOR="#89adc8" DESTINATION="ID_1799554074" ENDARROW="Default" ENDINCLINATION="340;0;" ID="Arrow_ID_19787354" SOURCE="ID_1865072728" STARTARROW="None" STARTINCLINATION="1589;0;"/>
 <icon BUILTIN="info"/>
 </node>
@@ -21057,6 +21057,22 @@
 <node COLOR="#338800" CREATED="1565276481723" ID="ID_486818015" MODIFIED="1565276514847" TEXT="signalStructureChange">
 <icon BUILTIN="button_ok"/>
 </node>
+<node BACKGROUND_COLOR="#eee5c3" COLOR="#990000" CREATED="1582930819530" ID="ID_1636643575" MODIFIED="1582930825502" TEXT="#1209 ensure display evaluation is performed reliably">
+<icon BUILTIN="flag-yellow"/>
+<node CREATED="1582930831025" ID="ID_1768705376" MODIFIED="1582930913112" TEXT="hatte einzelne Vorf&#xe4;lle im Testcode zum relativen Clip-Placement">
+<richcontent TYPE="NOTE"><html>
+  <head>
+    
+  </head>
+  <body>
+    <p>
+      wenn man die mark &quot;test&quot;-Nachricht an eine Timeline schickt, die vorher per Population &quot;reingeschossen&quot; wurde, ohne sie jemals im UI anzuzeigen. Das hei&#223;t, im Moment haben wir da <b>definitiv</b>&#160;eine offene Flanke -- allerdings ist das ganze Thema auch bisher ehr ein draft
+    </p>
+  </body>
+</html></richcontent>
+<icon BUILTIN="messagebox_warning"/>
+</node>
+</node>
 </node>
 <node BACKGROUND_COLOR="#eee5c3" COLOR="#990000" CREATED="1565276663937" ID="ID_712308681" MODIFIED="1565276681761" TEXT="Marker f&#xfc;r geplante Neuberechnung">
 <icon BUILTIN="flag-yellow"/>
@@ -21067,7 +21083,8 @@
 <icon BUILTIN="flag-yellow"/>
 </node>
 </node>
-<node BACKGROUND_COLOR="#eee5c3" COLOR="#990000" CREATED="1565276582060" ID="ID_1896159832" MODIFIED="1565276589005" TEXT="Display-Evaluation-Pass">
+<node BACKGROUND_COLOR="#eee5c3" COLOR="#990000" CREATED="1565276582060" ID="ID_1896159832" MODIFIED="1582931167057" TEXT="Display-Evaluation-Pass">
+<linktarget COLOR="#7b45d8" DESTINATION="ID_1896159832" ENDARROW="Default" ENDINCLINATION="-839;66;" ID="Arrow_ID_786196853" SOURCE="ID_1758019036" STARTARROW="None" STARTINCLINATION="667;67;"/>
 <icon BUILTIN="flag-yellow"/>
 </node>
 <node BACKGROUND_COLOR="#eee5c3" COLOR="#990000" CREATED="1565276594566" ID="ID_1897432572" MODIFIED="1565276599571" TEXT="Ergebnisse ablegen">
@@ -21460,6 +21477,10 @@
 <arrowlink COLOR="#5f57ba" DESTINATION="ID_1448105245" ENDARROW="Default" ENDINCLINATION="-1587;-35;" ID="Arrow_ID_532403594" STARTARROW="None" STARTINCLINATION="1293;134;"/>
 <linktarget COLOR="#464cb7" DESTINATION="ID_1989047133" ENDARROW="Default" ENDINCLINATION="-742;0;" ID="Arrow_ID_1408255827" SOURCE="ID_1456350700" STARTARROW="None" STARTINCLINATION="440;27;"/>
 <icon BUILTIN="flag-yellow"/>
+<node BACKGROUND_COLOR="#fdfdcf" COLOR="#ff0000" CREATED="1582931496462" ID="ID_1920766923" MODIFIED="1582931599326" TEXT="Ausdehnung der Tracks Header/Body koordinieren">
+<linktarget COLOR="#fe5b57" DESTINATION="ID_1920766923" ENDARROW="Default" ENDINCLINATION="595;0;" ID="Arrow_ID_1362710635" SOURCE="ID_1623890878" STARTARROW="Default" STARTINCLINATION="529;0;"/>
+<icon BUILTIN="flag-pink"/>
+</node>
 </node>
 <node COLOR="#338800" CREATED="1563467415158" ID="ID_29134005" MODIFIED="1563467420585" TEXT="Profil generieren">
 <icon BUILTIN="button_ok"/>
@@ -21685,7 +21706,7 @@
 </node>
 </node>
 </node>
-<node COLOR="#338800" CREATED="1575063986126" FOLDED="true" ID="ID_237283777" MODIFIED="1582926808921" TEXT="konkretisiert: als ViewHook-Mechanismus">
+<node COLOR="#338800" CREATED="1575063986126" ID="ID_237283777" MODIFIED="1582930967369" TEXT="konkretisiert: als ViewHook-Mechanismus">
 <richcontent TYPE="NOTE"><html>
   <head>
     
@@ -21794,7 +21815,7 @@
 <node CREATED="1575065165679" ID="ID_1342524311" MODIFIED="1575065176156" TEXT="f&#xfc;gt den TrackBody* hinten neu an"/>
 <node CREATED="1575065178531" ID="ID_1083347222" MODIFIED="1575065192431" TEXT="der sp&#xe4;ter folgende Display-Evaluation-Pass">
 <node CREATED="1575065193925" ID="ID_964654254" MODIFIED="1575065208561" TEXT="ausgel&#xf6;st durch das nun geleerte TrackProfile"/>
-<node CREATED="1575065210080" ID="ID_984570817" MODIFIED="1575065223586" TEXT="iteriert &#xfc;ber diese und bauch die Zeichen-Struktur neu auf"/>
+<node CREATED="1575065210080" ID="ID_984570817" MODIFIED="1582930995724" TEXT="iteriert &#xfc;ber diese und baut die Zeichen-Struktur neu auf"/>
 </node>
 </node>
 </node>
@@ -23701,7 +23722,8 @@
 <icon BUILTIN="flag-yellow"/>
 <node BACKGROUND_COLOR="#fdfdcf" COLOR="#ff0000" CREATED="1565281879855" ID="ID_386162681" MODIFIED="1565281891302" TEXT="Aufgabe: steuern">
 <icon BUILTIN="flag-pink"/>
-<node BACKGROUND_COLOR="#eee5c3" COLOR="#990000" CREATED="1565281895004" ID="ID_1758019036" MODIFIED="1565281912786" TEXT="was ist der Trigger-Punkt?">
+<node BACKGROUND_COLOR="#eee5c3" COLOR="#990000" CREATED="1565281895004" ID="ID_1758019036" MODIFIED="1582931167056" TEXT="was ist der Trigger-Punkt?">
+<arrowlink COLOR="#7b45d8" DESTINATION="ID_1896159832" ENDARROW="Default" ENDINCLINATION="-839;66;" ID="Arrow_ID_786196853" STARTARROW="None" STARTINCLINATION="667;67;"/>
 <icon BUILTIN="help"/>
 </node>
 <node BACKGROUND_COLOR="#eee5c3" COLOR="#990000" CREATED="1565281921697" ID="ID_459498695" MODIFIED="1565281934580" TEXT="wo wird ggfs diese Info gespeichert?">
@@ -23723,8 +23745,8 @@
 <node COLOR="#338800" CREATED="1565283074170" ID="ID_1990551085" MODIFIED="1566407001705" TEXT="Trigger/Berechnungsfunktion">
 <icon BUILTIN="button_ok"/>
 </node>
-<node COLOR="#435e98" CREATED="1565283089529" ID="ID_833580972" MODIFIED="1575131530100" TEXT="ausgel&#xf6;st durch allgemeine Struktur-&#xc4;nderungen">
-<arrowlink COLOR="#8db7cd" DESTINATION="ID_1799554074" ENDARROW="Default" ENDINCLINATION="598;258;" ID="Arrow_ID_1531606207" STARTARROW="None" STARTINCLINATION="411;28;"/>
+<node COLOR="#435e98" CREATED="1565283089529" ID="ID_833580972" MODIFIED="1582931247838" TEXT="ausgel&#xf6;st durch allgemeine Struktur-&#xc4;nderungen">
+<arrowlink COLOR="#8db7cd" DESTINATION="ID_1799554074" ENDARROW="Default" ENDINCLINATION="598;258;" ID="Arrow_ID_1531606207" STARTARROW="None" STARTINCLINATION="455;26;"/>
 <icon BUILTIN="info"/>
 </node>
 <node COLOR="#338800" CREATED="1566407025586" ID="ID_1467953135" MODIFIED="1566407042985" TEXT="sicherstellen, da&#xdf; vorher der DisplayEvaluationPass gelaufen ist">
@@ -23740,6 +23762,13 @@
 <icon BUILTIN="button_ok"/>
 </node>
 </node>
+<node BACKGROUND_COLOR="#eee5c3" COLOR="#990000" CREATED="1582931260542" ID="ID_43972117" MODIFIED="1582931271486" TEXT="Thema: Koordinieren zwischen Header und Body">
+<icon BUILTIN="flag-yellow"/>
+<node BACKGROUND_COLOR="#fdfdcf" COLOR="#ff0000" CREATED="1582931486072" ID="ID_1623890878" MODIFIED="1582931599326" TEXT="Ausdehnung der Tracks">
+<arrowlink COLOR="#fe5b57" DESTINATION="ID_1920766923" ENDARROW="Default" ENDINCLINATION="595;0;" ID="Arrow_ID_1362710635" STARTARROW="Default" STARTINCLINATION="529;0;"/>
+<icon BUILTIN="flag-pink"/>
+</node>
+</node>
 </node>
 <node COLOR="#435e98" CREATED="1555084648375" ID="ID_483631091" MODIFIED="1565283046031" TEXT="Thema: Struktur-Profil">
 <arrowlink COLOR="#2e66db" DESTINATION="ID_1659558780" ENDARROW="Default" ENDINCLINATION="-889;0;" ID="Arrow_ID_1691760775" STARTARROW="None" STARTINCLINATION="828;0;"/>
@@ -25535,9 +25564,9 @@
 <node CREATED="1563112611511" ID="ID_1116374684" MODIFIED="1563112636155" TEXT="man kann sich Margin/Padding besorgen">
 <icon BUILTIN="idea"/>
 </node>
-<node BACKGROUND_COLOR="#eee5c3" COLOR="#990000" CREATED="1566518952575" ID="ID_183446100" MODIFIED="1566519139547" TEXT="mu&#xdf; die sinngem&#xe4;&#xdf; mit den vom TrackBody verwalteten Spannen verrechnen">
-<arrowlink COLOR="#779be7" DESTINATION="ID_35592741" ENDARROW="Default" ENDINCLINATION="109;-329;" ID="Arrow_ID_66200016" STARTARROW="None" STARTINCLINATION="479;0;"/>
-<icon BUILTIN="flag-yellow"/>
+<node COLOR="#338800" CREATED="1566518952575" ID="ID_183446100" MODIFIED="1582931361646" TEXT="mu&#xdf; die sinngem&#xe4;&#xdf; mit den vom TrackBody verwalteten Spannen verrechnen">
+<arrowlink COLOR="#779be7" DESTINATION="ID_35592741" ENDARROW="Default" ENDINCLINATION="109;-329;" ID="Arrow_ID_66200016" STARTARROW="None" STARTINCLINATION="539;20;"/>
+<icon BUILTIN="button_ok"/>
 </node>
 </node>
 </node>
@@ -26273,8 +26302,8 @@
 </node>
 </node>
 </node>
-<node BACKGROUND_COLOR="#eee5c3" COLOR="#990000" CREATED="1566518983355" ID="ID_35592741" MODIFIED="1567112324220" TEXT="Zusammenspiel zw. H&#xf6;he und CSS">
-<linktarget COLOR="#779be7" DESTINATION="ID_35592741" ENDARROW="Default" ENDINCLINATION="109;-329;" ID="Arrow_ID_66200016" SOURCE="ID_183446100" STARTARROW="None" STARTINCLINATION="479;0;"/>
+<node BACKGROUND_COLOR="#eee5c3" COLOR="#990000" CREATED="1566518983355" ID="ID_35592741" MODIFIED="1582931361647" TEXT="Zusammenspiel zw. H&#xf6;he und CSS">
+<linktarget COLOR="#779be7" DESTINATION="ID_35592741" ENDARROW="Default" ENDINCLINATION="109;-329;" ID="Arrow_ID_66200016" SOURCE="ID_183446100" STARTARROW="None" STARTINCLINATION="539;20;"/>
 <icon BUILTIN="pencil"/>
 <node CREATED="1566518998190" ID="ID_284079883" MODIFIED="1566519017050" TEXT="Stylesheet bestimmt zus&#xe4;tzlichen Margin + Padding"/>
 <node CREATED="1566519017878" ID="ID_30554429" MODIFIED="1566519029065" TEXT="diese m&#xfc;ssen mit den Werten im TrackBody verrechnet werden">
@@ -33700,7 +33729,7 @@
 <icon BUILTIN="hourglass"/>
 </node>
 </node>
-<node COLOR="#338800" CREATED="1489191229098" ID="ID_341428100" MODIFIED="1566956320222" TEXT="#1089 Command instance management">
+<node COLOR="#338800" CREATED="1489191229098" ID="ID_341428100" MODIFIED="1582931241668" TEXT="#1089 Command instance management">
 <linktarget COLOR="#584d79" DESTINATION="ID_341428100" ENDARROW="Default" ENDINCLINATION="1995;-1317;" ID="Arrow_ID_879741123" SOURCE="ID_1331796226" STARTARROW="None" STARTINCLINATION="334;-13;"/>
 <icon BUILTIN="button_ok"/>
 <node CREATED="1489196572055" ID="ID_339289633" MODIFIED="1489196577154" TEXT="Command-ID">