From: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Sat, 3 Apr 2021 14:39:15 +0000 (+0100)
Subject: organise: Include Pos in PrimaryEnt
X-Git-Tag: otter-0.5.0~263
X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=commitdiff_plain;h=f5ee98667cdb0cecc01902507b9cbc07f8cee0fd;p=otter.git

organise: Include Pos in PrimaryEnt

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
---

diff --git a/src/organise.rs b/src/organise.rs
index f7967486..1d1176e8 100644
--- a/src/organise.rs
+++ b/src/organise.rs
@@ -82,6 +82,7 @@ impl Attempt {
 
 struct PrimaryEnt {
   piece: PieceId,
+  #[allow(dead_code)] pos: Pos,
   bbox: Rect,
 }
 
@@ -101,7 +102,7 @@ fn try_layout(region: &Rect,
   // Everything below n_y is overwriteable
   // Everything below and to the right of cur is overwriteable
 
-  for PrimaryEnt { piece, bbox } in pieces {
+  for PrimaryEnt { piece, bbox, .. } in pieces {
     let place = 'placed: loop {
       for xi in 0..3 {
         let place = (cur - att.tl(&bbox)?)?;
@@ -171,7 +172,7 @@ pub fn ui_operation(a: &mut ApiPieceOpArgs<'_>, opname: &str,
     if let Some(bbox) = want!( Ok = ipc.show(vis).bbox_approx(), ?piece );
     then {
       Some((
-        PrimaryEnt { piece, bbox },
+        PrimaryEnt { piece, bbox, pos: gpc.pos },
         gpc.zlevel.clone())
       )
     }