Browse Source

Try to fix build.

Michael Ragazzon 5 years ago
parent
commit
674e9a533e
3 changed files with 5 additions and 7 deletions
  1. 1 1
      Source/Core/LayoutBlockBox.cpp
  2. 3 0
      Source/Core/LayoutDetails.cpp
  3. 1 6
      Source/Core/LayoutEngine.cpp

+ 1 - 1
Source/Core/LayoutBlockBox.cpp

@@ -308,7 +308,7 @@ LayoutBlockBox::CloseResult LayoutBlockBox::Close()
 
 			if (found_baseline)
 			{
-				if (baseline < 0 && overflow_x_property != Style::Overflow::Visible || overflow_x_property != Style::Overflow::Visible)
+				if (baseline < 0 && (overflow_x_property != Style::Overflow::Visible || overflow_x_property != Style::Overflow::Visible))
 				{
 					baseline = 0;
 				}

+ 3 - 0
Source/Core/LayoutDetails.cpp

@@ -28,7 +28,10 @@
 
 #include "LayoutDetails.h"
 #include "LayoutEngine.h"
+#include "../../Include/RmlUi/Core/Element.h"
+#include "../../Include/RmlUi/Core/ElementScroll.h"
 #include "../../Include/RmlUi/Core/Math.h"
+#include "../../Include/RmlUi/Core/Profiling.h"
 #include <float.h>
 
 namespace Rml {

+ 1 - 6
Source/Core/LayoutEngine.cpp

@@ -27,18 +27,13 @@
  */
 
 #include "LayoutEngine.h"
-#include "../../Include/RmlUi/Core/Math.h"
-#include "Pool.h"
 #include "LayoutBlockBoxSpace.h"
 #include "LayoutDetails.h"
 #include "LayoutInlineBoxText.h"
+#include "Pool.h"
 #include "../../Include/RmlUi/Core/Element.h"
-#include "../../Include/RmlUi/Core/ElementScroll.h"
-#include "../../Include/RmlUi/Core/ElementText.h"
-#include "../../Include/RmlUi/Core/Property.h"
 #include "../../Include/RmlUi/Core/Profiling.h"
 #include "../../Include/RmlUi/Core/Types.h"
-#include <float.h>
 #include <cstddef>
 
 namespace Rml {