diff options
| author | FloppyDiskDrive <[email protected]> | 2017-11-22 11:38:11 -0600 |
|---|---|---|
| committer | FloppyDiskDrive <[email protected]> | 2017-11-22 11:38:11 -0600 |
| commit | 8c95325ac4a5a090eba3b13c893ccd5c28c0ad57 (patch) | |
| tree | dbf03a428e9e6573bd69de0282fe1a72517a9698 | |
| parent | 2cb81352d731a8326bb0acb33ca82a55933b48d5 (diff) | |
| parent | c84709a48624714a16a5a0b4f3bbb38842d1b978 (diff) | |
| download | shiftos-rewind-8c95325ac4a5a090eba3b13c893ccd5c28c0ad57.tar.gz shiftos-rewind-8c95325ac4a5a090eba3b13c893ccd5c28c0ad57.tar.bz2 shiftos-rewind-8c95325ac4a5a090eba3b13c893ccd5c28c0ad57.zip | |
Merge branch 'master' of https://github.com/ShiftOS-Rewind/ShiftOS
| -rw-r--r-- | ShiftOS.Engine/WindowManager/ShiftWM.cs | 2 | ||||
| -rw-r--r-- | ShiftOS.Engine/WindowManager/ShiftWindow.Designer.cs | 2 | ||||
| -rw-r--r-- | ShiftOS.Main/ShiftOS/Desktop.cs | 2 |
3 files changed, 4 insertions, 2 deletions
diff --git a/ShiftOS.Engine/WindowManager/ShiftWM.cs b/ShiftOS.Engine/WindowManager/ShiftWM.cs index 59322c1..4b57961 100644 --- a/ShiftOS.Engine/WindowManager/ShiftWM.cs +++ b/ShiftOS.Engine/WindowManager/ShiftWM.cs @@ -107,6 +107,8 @@ namespace ShiftOS.Engine.WindowManager extensions.OnLoaded(app); } + app.TopMost = true; + return app; } diff --git a/ShiftOS.Engine/WindowManager/ShiftWindow.Designer.cs b/ShiftOS.Engine/WindowManager/ShiftWindow.Designer.cs index df479ba..d3ffc19 100644 --- a/ShiftOS.Engine/WindowManager/ShiftWindow.Designer.cs +++ b/ShiftOS.Engine/WindowManager/ShiftWindow.Designer.cs @@ -229,7 +229,7 @@ this.Controls.Add(this.program); this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.None; this.Name = "ShiftWindow"; - this.Text = "c"; + this.Text = "Application Title"; this.program.ResumeLayout(false); this.titleBar.ResumeLayout(false); this.titleBar.PerformLayout(); diff --git a/ShiftOS.Main/ShiftOS/Desktop.cs b/ShiftOS.Main/ShiftOS/Desktop.cs index c61dea9..1bb47c6 100644 --- a/ShiftOS.Main/ShiftOS/Desktop.cs +++ b/ShiftOS.Main/ShiftOS/Desktop.cs @@ -18,7 +18,7 @@ namespace ShiftOS.Main.ShiftOS Closed += (sender, args) => { Application.Exit(); }; } - + private void shifterToolStripMenuItem_Click(object sender, EventArgs e) { Apps.ShifterStuff.Shifter app = new Apps.ShifterStuff.Shifter(); |
