Get rid of spacing in models

because it should be implemented in other way
drug007 · Oct 17, 2024 · e87fd37 · e87fd37
1 parent 26d95d4
commit e87fd37
Show file tree

Hide file tree

Showing 5 changed files with 92 additions and 108 deletions.
diff --git a/auxil/source/auxil/default_visitor.d b/auxil/source/auxil/default_visitor.d
@@ -392,7 +392,7 @@ struct MeasuringVisitor
 			const currentOrientation = model.orientation;
 		else
 			const currentOrientation = orientation;
-		model.sizeYM = model.headerSizeY = size[currentOrientation] + model.Spacing;
+		model.sizeYM = model.headerSizeY = size[currentOrientation];
 		return false;
 	}
 
@@ -417,7 +417,7 @@ struct MeasuringVisitor
 			if (parent.orientation != childOrientation)
 			{
 				// if orientations mismatch use parent orientation
-				parent.sizeYM += size[parent.orientation] + parent.Spacing;
+				parent.sizeYM += size[parent.orientation];
 				return;
 			}
 		}

diff --git a/auxil/source/auxil/model/package.d b/auxil/source/auxil/model/package.d
@@ -825,7 +825,7 @@ unittest
 
 	auto data = [0, 1, 2, 3];
 	auto model = makeModel(data);
-	auto visitor = MeasuringVisitor(0, 9);
+	auto visitor = MeasuringVisitor(0, 10);
 
 	model.collapsed = false;
 	model.traversalForward(data, visitor);

diff --git a/auxil/source/auxil/model/state.d b/auxil/source/auxil/model/state.d
@@ -4,7 +4,6 @@ mixin template State()
 {
     import auxil.common : SizeType, Orientation;
 
-	enum Spacing = 1;
 	SizeType sizeYM = 0, headerSizeY = 0;
 	int _placeholder = 1 << Field.Collapsed | 
 	                   1 << Field.Enabled;
@@ -58,7 +57,6 @@ mixin template StateScalar()
 {
     import auxil.common : SizeType, Orientation;
 
-	enum Spacing = 1;
 	SizeType sizeYM = 0;
 	alias headerSizeY = sizeYM;
 

diff --git a/auxil/source/auxil/test.d b/auxil/source/auxil/test.d
@@ -110,7 +110,7 @@ unittest
 	m.makeDefaultMeasuring(d, width, height);
 
 	m.traversalForward(d, visitor);
-	m.sizeYM.should.be == 10;
+	m.sizeYM.should.be == 9;
 	d.d = 0;
 	d.l = 1;
 	d.t.f = 2;
@@ -741,49 +741,49 @@ unittest
 
 	model.collapsed.should.be == true;
 	model.sizeYM.should.be ~ visitor.sizeY;
-	model.sizeYM.should.be ~ 18.0;
+	model.sizeYM.should.be ~ 17.0;
 	visitor.posY.should.be ~ 0.0;
 
 	setPropertyByTreePath!"collapsed"(data, model, [], false);
 	model.makeDefaultMeasuring(data, width, height);
 	model.traversalForward(data, visitor);
 	model.sizeYM.should.be ~ visitor.sizeY*7;
-	model.sizeYM.should.be ~ 18.0*7;
-	visitor.posY.should.be ~ 6*18.0;
+	model.sizeYM.should.be ~ 17.0*7;
+	visitor.posY.should.be ~ 6*17.0;
 
 	setPropertyByTreePath!"collapsed"(data, model, [3], false);
 	model.makeDefaultMeasuring(data, width, height);
 	model.traversalForward(data, visitor);
 	model.sizeYM.should.be ~ visitor.sizeY*9;
-	model.sizeYM.should.be ~ 18.0*9;
-	visitor.posY.should.be ~ (6+2)*18.0;
+	model.sizeYM.should.be ~ 17.0*9;
+	visitor.posY.should.be ~ (6+2)*17.0;
 
 	setPropertyByTreePath!"collapsed"(data, model, [4], false);
 	model.makeDefaultMeasuring(data, width, height);
 	model.traversalForward(data, visitor);
 	model.sizeYM.should.be ~ visitor.sizeY*12;
-	model.sizeYM.should.be ~ 18.0*12;
-	visitor.posY.should.be ~ (6+2+3)*18.0;
+	model.sizeYM.should.be ~ 17.0*12;
+	visitor.posY.should.be ~ (6+2+3)*17.0;
 
 	setPropertyByTreePath!"collapsed"(data, model, [5], false);
 	model.makeDefaultMeasuring(data, width, height);
 	model.traversalForward(data, visitor);
 	model.sizeYM.should.be ~ visitor.sizeY*15;
-	model.sizeYM.should.be ~ 18.0*15;
-	visitor.posY.should.be ~ (6+2+3+3)*18.0;
+	model.sizeYM.should.be ~ 17.0*15;
+	visitor.posY.should.be ~ (6+2+3+3)*17.0;
 
 	visitor.destY = visitor.destY.nan;
 	model.makeDefaultMeasuring(data, width, height);
 	model.traversalForward(data, visitor);
-	model.sizeYM.should.be == 270;
-	visitor.posY.should.be == 252;
+	model.sizeYM.should.be == 255;
+	visitor.posY.should.be == 238;
 
 	visitor.posY = 0;
 	visitor.destY = 100;
 	model.makeDefaultMeasuring(data, width, height);
 	model.traversalForward(data, visitor);
-	model.sizeYM.should.be == 270;
-	visitor.posY.should.be == 90;
+	model.sizeYM.should.be == 255;
+	visitor.posY.should.be == 85;
 }
 
 struct RelativeMeasurer
@@ -1180,7 +1180,7 @@ unittest
 
 	model.collapsed = false;
 	{
-		auto mv = MeasuringVisitor(0, 9);
+		auto mv = MeasuringVisitor(0, 10);
 		model.traversalForward(data, mv);
 	}
 	visitor.posY = 0;
@@ -1255,13 +1255,12 @@ unittest
 	model.collapsed = false;
 	model.collapsed.should.be == false;
 	{
-		auto mv = MeasuringVisitor(0, 9);
+		auto mv = MeasuringVisitor(0, 10);
 		model.traversalForward(data, mv);
 	}
 	visitor.posX = 0;
 	visitor.posY = 0;
-import std.stdio;
-debug writeln("---");
+
 	model.traversalForward(data, visitor);
 	visitor.output.should.be == [
 		TreePosition([], 0),