diff options
| author | Michael <[email protected]> | 2017-02-18 13:25:30 -0500 |
|---|---|---|
| committer | Michael <[email protected]> | 2017-02-18 13:25:30 -0500 |
| commit | 423569f4ae2558b135f92d2f9cb7e163eb7bcc22 (patch) | |
| tree | 1ff082f62378119a916a73deb1eb3b4fb1c0b72f /ShiftOS.WinForms | |
| parent | 5c025fd165755a7801c51ff263dbc12a7cdab4d6 (diff) | |
| download | shiftos_thereturn-423569f4ae2558b135f92d2f9cb7e163eb7bcc22.tar.gz shiftos_thereturn-423569f4ae2558b135f92d2f9cb7e163eb7bcc22.tar.bz2 shiftos_thereturn-423569f4ae2558b135f92d2f9cb7e163eb7bcc22.zip | |
Add on_key_down event and other goodies
Diffstat (limited to 'ShiftOS.WinForms')
| -rw-r--r-- | ShiftOS.WinForms/Tools/ControlManager.cs | 11 | ||||
| -rw-r--r-- | ShiftOS.WinForms/WindowBorder.cs | 4 | ||||
| -rw-r--r-- | ShiftOS.WinForms/WinformsDesktop.cs | 2 |
3 files changed, 16 insertions, 1 deletions
diff --git a/ShiftOS.WinForms/Tools/ControlManager.cs b/ShiftOS.WinForms/Tools/ControlManager.cs index f9fb799..32f0217 100644 --- a/ShiftOS.WinForms/Tools/ControlManager.cs +++ b/ShiftOS.WinForms/Tools/ControlManager.cs @@ -229,8 +229,19 @@ namespace ShiftOS.WinForms.Tools if (a.Control && a.KeyCode == Keys.T) { a.SuppressKeyPress = true; + + + if (SaveSystem.CurrentSave != null) + { + if (Shiftorium.UpgradeInstalled("window_manager")) + { + Engine.AppearanceManager.SetupWindow(new Applications.Terminal()); + } + } } + ShiftOS.Engine.Scripting.LuaInterpreter.RaiseEvent("on_key_down", a); + //a.Handled = true; }; if (ctrl is Button) { diff --git a/ShiftOS.WinForms/WindowBorder.cs b/ShiftOS.WinForms/WindowBorder.cs index 0226070..eae764c 100644 --- a/ShiftOS.WinForms/WindowBorder.cs +++ b/ShiftOS.WinForms/WindowBorder.cs @@ -117,7 +117,7 @@ namespace ShiftOS.WinForms { Setup(); (ParentWindow as IShiftOSWindow).OnSkinLoad(); - ControlManager.SetupControl(this.pnlcontents); + ControlManager.SetupControls(this.pnlcontents); } catch { @@ -159,6 +159,8 @@ namespace ShiftOS.WinForms } } } + + ShiftOS.Engine.Scripting.LuaInterpreter.RaiseEvent("on_key_down", a); } /// <summary> diff --git a/ShiftOS.WinForms/WinformsDesktop.cs b/ShiftOS.WinForms/WinformsDesktop.cs index 0ea150c..ab04bc8 100644 --- a/ShiftOS.WinForms/WinformsDesktop.cs +++ b/ShiftOS.WinForms/WinformsDesktop.cs @@ -100,6 +100,8 @@ namespace ShiftOS.WinForms if (a.Shift) CtrlTabMenu.CycleBack(); else CtrlTabMenu.CycleForwards(); }*/ //nyi + + ShiftOS.Engine.Scripting.LuaInterpreter.RaiseEvent("on_key_down", a); }; SkinEngine.SkinLoaded += () => { |