From b8eb7dccfdd16bd1d39bbedeb176fce7f0f1dc9e Mon Sep 17 00:00:00 2001 From: Michael Date: Wed, 19 Jul 2017 16:08:33 -0400 Subject: Fix terminal and add support for animations --- ShiftOS.Frontend/GUI/Control.cs | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) (limited to 'ShiftOS.Frontend/GUI/Control.cs') diff --git a/ShiftOS.Frontend/GUI/Control.cs b/ShiftOS.Frontend/GUI/Control.cs index d34a97a..b78f032 100644 --- a/ShiftOS.Frontend/GUI/Control.cs +++ b/ShiftOS.Frontend/GUI/Control.cs @@ -429,7 +429,7 @@ namespace ShiftOS.Frontend.GUI } } - public void Layout() + public void Layout(GameTime gameTime) { //Dock style if(_parent != null) @@ -469,12 +469,12 @@ namespace ShiftOS.Frontend.GUI break; } } - OnLayout(); + OnLayout(gameTime); foreach (var child in _children) - child.Layout(); + child.Layout(gameTime); } - protected virtual void OnLayout() + protected virtual void OnLayout(GameTime gameTime) { //do nothing } @@ -621,7 +621,6 @@ namespace ShiftOS.Frontend.GUI { _mouseX = coords.X; _mouseY = coords.Y; - Layout(); _wasMouseInControl = true; int newX = MathHelper.Clamp(state.X, X, X + Width); int newY = MathHelper.Clamp(state.Y, Y, Y + Height); -- cgit v1.2.3