diff options
| author | Michael <[email protected]> | 2017-07-19 16:08:33 -0400 |
|---|---|---|
| committer | Michael <[email protected]> | 2017-07-19 16:08:33 -0400 |
| commit | b8eb7dccfdd16bd1d39bbedeb176fce7f0f1dc9e (patch) | |
| tree | 4502ced3e939ff3725bc7c1925f1ba88b62653d8 /ShiftOS.Frontend/GUI/Control.cs | |
| parent | 3fe1872f5f81f8203e57cbba2dca6ce833f08f22 (diff) | |
| download | shiftos_thereturn-b8eb7dccfdd16bd1d39bbedeb176fce7f0f1dc9e.tar.gz shiftos_thereturn-b8eb7dccfdd16bd1d39bbedeb176fce7f0f1dc9e.tar.bz2 shiftos_thereturn-b8eb7dccfdd16bd1d39bbedeb176fce7f0f1dc9e.zip | |
Fix terminal and add support for animations
Diffstat (limited to 'ShiftOS.Frontend/GUI/Control.cs')
| -rw-r--r-- | ShiftOS.Frontend/GUI/Control.cs | 9 |
1 files changed, 4 insertions, 5 deletions
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); |