Merge pull request #1190 from kusma/fix-issue-1186

Revert " fixes #1096"
fuse-open · May 24, 2018 · 0b4fa39 · 0b4fa39
2 parents fb3ccad + 295b3d3
commit 0b4fa39
Show file tree

Hide file tree

Showing 9 changed files with 23 additions and 59 deletions.
diff --git a/Source/Fuse.Android/AndroidApp.uno b/Source/Fuse.Android/AndroidApp.uno
@@ -53,7 +53,7 @@ namespace Fuse
 
 			Uno.Platform.Displays.MainDisplay.Tick += OnTick;
 		}
-		
+
 		public sealed override IList<Node> Children
 		{
 			get { return RootVisual.Children; }
@@ -66,6 +66,7 @@ namespace Fuse
 
 		void OnTick(object sender, Uno.Platform.TimerEventArgs args)
 		{
+			RootViewport.InvalidateLayout();
 			try
 			{
 				PropagateBackground();

diff --git a/Source/Fuse.Controls.Native/Fuse.Controls.Native.unoproj b/Source/Fuse.Controls.Native/Fuse.Controls.Native.unoproj
@@ -21,14 +21,13 @@
     "Uno.Threading",
   ],
   "Projects": [
-    "../Fuse.Common/Fuse.Common.unoproj",
+    "../Fuse.Drawing.Surface/Fuse.Drawing.Surface.unoproj",
     "../Fuse.Drawing/Fuse.Drawing.unoproj",
     "../Fuse.Drawing.Planar/Fuse.Drawing.Planar.unoproj",
-    "../Fuse.Drawing.Surface/Fuse.Drawing.Surface.unoproj",
+    "../Fuse.Triggers/Fuse.Triggers.unoproj",
     "../Fuse.Elements/Fuse.Elements.unoproj",
     "../Fuse.Nodes/Fuse.Nodes.unoproj",
-    "../Fuse.Platform/Fuse.Platform.unoproj",
-    "../Fuse.Triggers/Fuse.Triggers.unoproj",
+    "../Fuse.Common/Fuse.Common.unoproj",
   ],
   "Includes": [
     "*",

diff --git a/Source/Fuse.Controls.Native/NativeRootViewport.uno b/Source/Fuse.Controls.Native/NativeRootViewport.uno
@@ -21,12 +21,5 @@ namespace Fuse.Controls.Native
 		{
 			_rootView = rootView;
 		}
-
-		extern(Android)
-		internal override bool IsViewportReady
-		{
-			get { return Fuse.Platform.SystemUI.IsReady; }
-		}
-
 	}
 }
diff --git a/Source/Fuse.Nodes/RootViewport.uno b/Source/Fuse.Nodes/RootViewport.uno
@@ -85,15 +85,9 @@ namespace Fuse
 			OnInvalidateLayout();
 		}
 
-		internal virtual bool IsViewportReady
-		{
-			get { return true; }
-		}
-
 		protected override void OnInvalidateLayout()
 		{
-			if (IsViewportReady)
-				UpdateManager.AddOnceAction(PerformLayout, UpdateStage.Layout);
+			UpdateManager.AddOnceAction(PerformLayout, UpdateStage.Layout);
 		}
 
 		void IDisposable.Dispose()

diff --git a/Source/Fuse.Platform/Android/SystemUI.uno b/Source/Fuse.Platform/Android/SystemUI.uno
@@ -81,9 +81,16 @@ namespace Fuse.Platform
 		static public Rect Frame
 		{
 			get { return _frame; }
+			private set
+			{
+				if (Rect.Equals(_frame, value))
+					return;
+
+				_frame = value;
+				OnFrameChanged();
+			}
 		}
 
-		//Whenever frame changes, includes IsReady status change
 		static public event EventHandler FrameChanged;
 		static private void OnFrameChanged()
 		{
@@ -438,21 +445,23 @@ namespace Fuse.Platform
 		@}
 
 
-		static internal bool IsReady { get; private set; }
-
 		[Require("Source.Include", "Uno/Graphics/GLHelper.h")]
 		static void cppOnConfigChanged()
 		{
 			extern "GLHelper::SwapBackToBackgroundSurface()";
-
+			ResetGeometry();
+		}
+
+		[Require("Source.Include", "Uno/Graphics/GLHelper.h")]
+		static void ResetGeometry()
+		{
+			extern "GLHelper::SwapBackToBackgroundSurface()";
 			var density = GetDensity();
 			var pos = float2(0f, 0f);
 			var size = _GetRootDisplaySize();
 			var frame = new Rect(pos, size);
+			Frame = frame;
 			Density = density;
-			_frame = frame;
-			IsReady = true;
-			OnFrameChanged();
 		}
 
 		[Foreign(Language.Java)]

diff --git a/Source/Fuse.Platform/Fuse.Platform.unoproj b/Source/Fuse.Platform/Fuse.Platform.unoproj
@@ -9,7 +9,6 @@
     "Fuse.Views",
     "Fuse.Android",
     "Fuse.Common",
-    "Fuse.Controls.Native",
     "Fuse.Controls.Panels",
     "Fuse.Controls.WebView",
     "Fuse.Elements",

diff --git a/Tests/ManualTests/ManualTestingApp/InterceptPanel.uno b/Tests/ManualTests/ManualTestingApp/InterceptPanel.uno
diff --git a/Tests/ManualTests/ManualTestingApp/TestApp.ux b/Tests/ManualTests/ManualTestingApp/TestApp.ux
@@ -2,15 +2,7 @@
 	<!-- Leave as 0.0.0.0, the resource is updated by set_version.sh on a  release -->
 	<string ux:Key="ResourceString" ux:Value="0.0.0.0"/>
 
-	<!-- This will detect some invalid rooting/setup: it checks the symptom of getting a 0,0 size -->
-	<InterceptPanel Invalid="whenInvalid"><!-- Also checks root test with multiple children -->
-		<WhileTrue Value="false" ux:Name="whenInvalid">
-			<Panel Color="#8008">
-				<Text FontSize="64" Value="Invalid Bootstrap"/>
-			</Panel>
-		</WhileTrue>
-	</InterceptPanel>
-
+	<Panel ux:Name="SoRootTestChecksMultipleChildren"/>
 	<TestAppTheme/>
 	<MainView/>
 </App>
diff --git a/Tests/ManualTests/ManualTestingApp/UnoComponents.unoproj b/Tests/ManualTests/ManualTestingApp/UnoComponents.unoproj
@@ -28,7 +28,6 @@
     "HttpXml/HttpXmlView.ux:UX",
     "HttpXml/ResultItem.ux.uno:Source",
     "HttpXml/ResultItem.ux:UX",
-    "InterceptPanel.uno:Source",
     "IsEnabled/IsEnabled2.ux:UX",
     "IsEnabled/IsEnabled.ux.uno:Source",
     "IsEnabled/IsEnabled.ux:UX",