Merge branch 'v_dev'

LayoutFarm · Sep 12, 2015 · 24366ad · 24366ad
2 parents b799662 + e4ed4cd
commit 24366ad
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 3 deletions.
diff --git a/Source/LayoutFarm.HtmlRenderer/2_Boxes/0_Root/HtmlContainer.cs b/Source/LayoutFarm.HtmlRenderer/2_Boxes/0_Root/HtmlContainer.cs
@@ -147,7 +147,8 @@ public void PerformLayout(LayoutVisitor lay)
 
                 CssBox prevParent = null;
                 //TODO: review here again
-                float extraAdjust = 0; //temp fixed
+                float extraAdjustX = 0; //temp fixed
+
 
                 for (int n = 0; n < floatBoxCount; ++n)
                 {
@@ -163,10 +164,13 @@ public void PerformLayout(LayoutVisitor lay)
                         if (n > 0)
                         {
                             CssBox prevFloatChild = floatingContext.GetBox(n - 1);
-                            extraAdjust = prevFloatChild.ActualMarginRight + box.ActualMarginLeft;
+                            //TODO: review here again
+                            //temp fix
+                            extraAdjustX = prevFloatChild.ActualMarginRight + box.ActualMarginLeft;
+                            ny += box.ActualMarginTop;
                         }
                     }
-                    box.SetLocation(nx + extraAdjust, ny);
+                    box.SetLocation(nx + extraAdjustX, ny);
                     prevParent = box.ParentBox;
                     floatingOwner.AppendToAbsoluteLayer(box);
                 }

diff --git a/readme_imgs/s02_nearly_acid1.png b/readme_imgs/s02_nearly_acid1.png