The keyboard can now go on your head

... and hands
nyakowint · Dec 29, 2023 · c16d3fe · c16d3fe
1 parent c6d1273
commit c16d3fe
Show file tree

Hide file tree

Showing 4 changed files with 21 additions and 5 deletions.
diff --git a/KeyboardOSC/Patches.cs b/KeyboardOSC/Patches.cs
@@ -12,7 +12,10 @@ namespace KeyboardOSC;
 public static class Patches
 {
     private static Harmony Harmony;
-    private static WindowAttachementManager.DeviceToAttachTo kbAttachedTo;
+
+    private static WindowAttachementManager.DeviceToAttachTo kbAttachedTo =
+        WindowAttachementManager.DeviceToAttachTo.None;
+
     private static bool HasSettingsBeenOpenedOnce;
 
     public static void PatchAll()
@@ -127,6 +130,7 @@ public static void RequestSettingsPatch(string sender, string data)
             KBCheckForUpdates = PluginSettings.GetSetting<bool>("CheckForUpdates").Value,
             KBLiveSend = PluginSettings.GetSetting<bool>("LiveSend").Value,
             KBTypingIndicator = PluginSettings.GetSetting<bool>("TypingIndicator").Value,
+            KBAttachmentIndex = (int)kbAttachedTo
         };
         var data2 = JsonUtility.ToJson(settings, true);
         ServerBridge.Instance.SendMessage("UpdateSettings", data2, null, sender);

diff --git a/KeyboardOSC/Plugin.cs b/KeyboardOSC/Plugin.cs
@@ -206,6 +206,10 @@ private void SetupBar()
 
 
             ChatMode.Setup(oscbarText, charCounterText);
+
+            var trackDevice = keyboardWindowObj.AddComponent<Overlay_TrackDevice>();
+            trackDevice.TrackedDevice = Unity_Overlay.OverlayTrackedDevice.None;
+
             oscBarRoot.SetActive(true);
             keyboardWindowObj.SetActive(true);
             WindowMovementManager.MoveToEdgeOfWindowAndInheritRotation(oscBarWindow, keyboardWindow,
@@ -222,7 +226,7 @@ public void RepositionBar(Unity_Overlay barOverlay, Unity_Overlay keebOverlay)
 
         public void AttachKeyboard(int anchor)
         {
-            WindowMovementManager.WMM_Inst.AttachWindowToDeviceIndex(anchor, overlayManager.Keyboard_Overlay);
+            WindowMovementManager.WMM_Inst.AttachWindowToDeviceIndex(anchor, Overlay_Manager.Instance.Keyboard_Overlay);
         }
 
         public void ToggleChatMode()

diff --git a/KeyboardOSC/PluginSettings.cs b/KeyboardOSC/PluginSettings.cs
@@ -37,4 +37,5 @@ public class UiSettings
     public bool KBCheckForUpdates = false;
     public bool KBLiveSend = false;
     public bool KBTypingIndicator = true;
+    public int KBAttachmentIndex = 0;
 }
diff --git a/settingsKO.js b/settingsKO.js
@@ -62,10 +62,10 @@ const SettingsLayout = {
         _: {
             KBCheckForUpdates: new SettingsElements.Setting(SettingsElements.UIComponents.Toggle, 'Notify about updates', "The plugin will notify you if there's an update available :D", false),
             KBLiveSend: new SettingsElements.Setting(SettingsElements.UIComponents.Toggle, 'Live send mode', "Messages will be sent to the chatbox as you type.", false),
-            KBTypingIndicator: new SettingsElements.Setting(SettingsElements.UIComponents.Toggle, 'Send typing indicator', "Some people prefer to not let people know when they are typing for some reason lol", true),
-            KBAttachmentIndex: new SettingsElements.Setting(SettingsElements.UIComponents.Dropdown, 'Keyboard Attachment', "put the keyboard on ur head idk", 'Disabled', ['Disabled', 'So no head?', 'Left hand', 'Right hand']),
-            KBOpenRepo: new SettingsElements.Setting(SettingsElements.UIComponents.Button, 'Plugin Repo', "View this plugin's repo on GitHub", '', '', ''),
+            KBTypingIndicator: new SettingsElements.Setting(SettingsElements.UIComponents.Toggle, 'Send typing indicator', "Some people prefer to not let people know when they are typing. If this is you here ya go!", true),
+            KBAttachmentIndex: new SettingsElements.Setting(SettingsElements.UIComponents.Dropdown, 'Keyboard Attachment', "put the keyboard on ur head idk, attaching to your hand basically makes you one handed lool", 'Disabled', ['Disabled', 'So no head?', 'Left hand', 'Right hand']),
             KBVersionCheck: new SettingsElements.Setting(SettingsElements.UIComponents.Button, 'Check for updates', "Check for updates rn!!!!!", '', '', ''),
+            KBOpenRepo: new SettingsElements.Setting(SettingsElements.UIComponents.Button, 'Plugin Repo', "View this plugin's repo on GitHub", '', '', ''),
             KBVersion: new SettingsElements.Setting(SettingsElements.UIComponents.Text, 'KBVersion'),
         },
     },
@@ -527,5 +527,12 @@ function SetMenuStates(data) {
     var appVersionText = document.getElementById("VersionNumber_Desc");
     appVersionText.innerHTML = `Build ${data.VersionNumber}`;
 
+    console.log(data)
+
+    if (data.KBVersion) {
+        var kbVersion = document.getElementById("KBVersion_Desc");
+        kbVersion.innerHTML = `KeyboardOSC Version ${data.KBVersion}`;
+    }
+
     console.log("Settings Updated.");
 }