From dcd8404d2cae2cb8f4b5f368e11798f92cce0e1f Mon Sep 17 00:00:00 2001 From: Ian Jackson Date: Sun, 27 Sep 2020 17:14:50 +0100 Subject: [PATCH] refactor layout algorithm to allow clash avoidance Signed-off-by: Ian Jackson --- src/bin/otter.rs | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/src/bin/otter.rs b/src/bin/otter.rs index a76934e9..a90d39fb 100644 --- a/src/bin/otter.rs +++ b/src/bin/otter.rs @@ -768,19 +768,18 @@ mod library_add { fn place(&mut self, bbox: &[Pos;2]) -> Option { let PosC([w,h]) = bbox[1] - bbox[0]; - let mut limit = 0..2; - let tlhs = loop { - limit.next()?; // item just too wide, maybe + let (ncbot, tlhs) = loop { + let ncbot = max(self.cbot, self.top + h); + if ncbot > self.bot { None? } let tlhs = self.clhs; self.clhs += w; - if self.clhs <= self.rhs { break tlhs } + if self.clhs <= self.rhs { break (ncbot, tlhs) } // line is full self.top = self.cbot; self.clhs = self.lhs; + // if we are simply too wide, we'll just loop until off the bottom }; - self.cbot = max(self.cbot, self.top + h); - if self.cbot > self.bot { None? } - + self.cbot = ncbot; let ttopleft = PosC([tlhs, self.top]); let tnominal = ttopleft - bbox[0]; -- 2.30.2