diff options
| author | Michael <[email protected]> | 2017-07-05 11:24:37 -0400 |
|---|---|---|
| committer | Michael <[email protected]> | 2017-07-05 11:24:37 -0400 |
| commit | e7b288968b8923eb5a7b9c358de75e521f1d8bde (patch) | |
| tree | 36bc169f1f191e378dda91118375d476cd907b64 | |
| parent | 181f94e70106dce186623d0d35d2646f2cc9dab3 (diff) | |
| download | shiftos_thereturn-e7b288968b8923eb5a7b9c358de75e521f1d8bde.tar.gz shiftos_thereturn-e7b288968b8923eb5a7b9c358de75e521f1d8bde.tar.bz2 shiftos_thereturn-e7b288968b8923eb5a7b9c358de75e521f1d8bde.zip | |
panel buttons refresh when windows are closed
| -rw-r--r-- | ShiftOS.Frontend/Desktop/WindowManager.cs | 11 | ||||
| -rw-r--r-- | ShiftOS.Frontend/GraphicsSubsystem/UIManager.cs | 9 |
2 files changed, 18 insertions, 2 deletions
diff --git a/ShiftOS.Frontend/Desktop/WindowManager.cs b/ShiftOS.Frontend/Desktop/WindowManager.cs index a43d3bc..e48ac7c 100644 --- a/ShiftOS.Frontend/Desktop/WindowManager.cs +++ b/ShiftOS.Frontend/Desktop/WindowManager.cs @@ -21,6 +21,13 @@ namespace ShiftOS.Frontend.Desktop if (brdr != null) { brdr.Close(); + RunningBorders.Remove(brdr); + if (AppearanceManager.OpenForms.Contains(brdr)) + { + AppearanceManager.OpenForms.Remove(brdr); + TileWindows(); + Engine.Desktop.ResetPanelButtons(); + } win = null; } } @@ -324,7 +331,7 @@ namespace ShiftOS.Frontend.Desktop gfx.DrawRectangle(titlebarleft, 0, titlebarwidth, titleheight, UIManager.SkinTextures["titlebar"]); } //Now we draw the title text. - var textMeasure = gfx.MeasureString(_text, titlefont); + var textMeasure = gfx.MeasureString(Text, titlefont); PointF textloc; if (titletextcentered) textloc = new PointF((titlebarwidth - textMeasure.X) / 2, @@ -332,7 +339,7 @@ namespace ShiftOS.Frontend.Desktop else textloc = new PointF(titlebarleft + titletextleft.X, titletextleft.Y); - gfx.DrawString(_text, (int)textloc.X, (int)textloc.Y, titletextcolor.ToMonoColor(), titlefont); + gfx.DrawString(Text, (int)textloc.X, (int)textloc.Y, titletextcolor.ToMonoColor(), titlefont); var tbuttonpos = LoadedSkin.TitleButtonPosition; diff --git a/ShiftOS.Frontend/GraphicsSubsystem/UIManager.cs b/ShiftOS.Frontend/GraphicsSubsystem/UIManager.cs index ac8c6f2..fa17807 100644 --- a/ShiftOS.Frontend/GraphicsSubsystem/UIManager.cs +++ b/ShiftOS.Frontend/GraphicsSubsystem/UIManager.cs @@ -55,6 +55,13 @@ namespace ShiftOS.Frontend.GraphicsSubsystem continue; } var _target = TextureCaches[hc]; + var gfxContext = new GraphicsContext(batch.GraphicsDevice, batch, ctrl.X, ctrl.Y, ctrl.Width + 5, ctrl.Height + 5); + gfxContext.DrawRectangle(ctrl.Width, 0, 1, ctrl.Height, Color.Black); + gfxContext.DrawRectangle(ctrl.Width + 1, 0, 1, ctrl.Height, Color.Black * 0.75f); + gfxContext.DrawRectangle(ctrl.Width + 2, 0, 1, ctrl.Height, Color.Black * 0.5f); + gfxContext.DrawRectangle(ctrl.Width + 3, 0, 1, ctrl.Height, Color.Black * 0.25f); + + batch.Draw(_target, new Rectangle(ctrl.X, ctrl.Y, ctrl.Width, ctrl.Height), Color.White); } } @@ -174,6 +181,8 @@ namespace ShiftOS.Frontend.GraphicsSubsystem } + public static bool ExperimentalEffects = true; + public static Queue<Action> CrossThreadOperations = new Queue<Action>(); public static void DrawBackgroundLayer(GraphicsDevice graphics, SpriteBatch batch, int width, int height) |