diff --git a/GameData/TestFlight/Plugins/TestFlight.dll b/GameData/TestFlight/Plugins/TestFlight.dll index 84349d9a..562b2dff 100755 Binary files a/GameData/TestFlight/Plugins/TestFlight.dll and b/GameData/TestFlight/Plugins/TestFlight.dll differ diff --git a/GameData/TestFlight/Plugins/TestFlightAPI.dll b/GameData/TestFlight/Plugins/TestFlightAPI.dll index 0c111ac0..957f6385 100755 Binary files a/GameData/TestFlight/Plugins/TestFlightAPI.dll and b/GameData/TestFlight/Plugins/TestFlightAPI.dll differ diff --git a/GameData/TestFlight/Plugins/TestFlightCore.dll b/GameData/TestFlight/Plugins/TestFlightCore.dll index 13ca845b..5257bc23 100755 Binary files a/GameData/TestFlight/Plugins/TestFlightCore.dll and b/GameData/TestFlight/Plugins/TestFlightCore.dll differ diff --git a/TestFlight.userprefs b/TestFlight.userprefs index e855f352..1c95235a 100644 --- a/TestFlight.userprefs +++ b/TestFlight.userprefs @@ -1,6 +1,6 @@  - + @@ -11,30 +11,30 @@ - + - + - - - + + + - + - + + - - - + + diff --git a/TestFlightCore/TestFlightCore/TestFlightKSC.cs b/TestFlightCore/TestFlightCore/TestFlightKSC.cs index e6b2f427..849a4296 100644 --- a/TestFlightCore/TestFlightCore/TestFlightKSC.cs +++ b/TestFlightCore/TestFlightCore/TestFlightKSC.cs @@ -67,6 +67,7 @@ internal void Startup() TooltipStatic = true; WindowCaption = ""; StartCoroutine("AddToToolbar"); + TestFlight.Resources.LoadTextures(); List views = new List() { "Visual Settings", @@ -86,7 +87,7 @@ internal void CalculateWindowBounds() if (tfScenario == null) return; - float windowWidth = 350f; + float windowWidth = 500f; float left = Screen.width - windowWidth - 75f; float windowHeight = 100f; float top = 40f; @@ -116,7 +117,7 @@ IEnumerator AddToToolbar() HoverOutButton, null, null, - ApplicationLauncher.AppScenes.VAB | ApplicationLauncher.AppScenes.SPH, + ApplicationLauncher.AppScenes.SPACECENTER, iconTexture); ApplicationLauncher.Instance.AddOnHideCallback(HideButton); ApplicationLauncher.Instance.AddOnRepositionCallback(RepostionWindow); @@ -145,7 +146,6 @@ void HideButton() void RepostionWindow() { CalculateWindowBounds(); - Debug.Log("TestFlight MasterStatusDisplay: RepositionWindow"); } void HoverInButton() { @@ -159,9 +159,11 @@ void HoverOutButton() } internal override void OnGUIOnceOnly() { + Log("Initializing GUI styles and skins"); Styles.InitStyles(); Styles.InitSkins(); SkinsLibrary.SetCurrent("SolarizedDark"); + SkinsLibrary.CurrentSkin.label.wordWrap = true; } internal override void DrawWindow(int id) { @@ -176,8 +178,8 @@ internal override void DrawWindow(int id) { case 0: GUILayout.Label("Research & Development"); - GUILayout.Label("Here you can allocate R&D teams to working on improving your hardware. Mouse over for help."); - tfScenario.userSettings.currentResearchScrollPosition = GUILayout.BeginScrollView(tfScenario.userSettings.currentResearchScrollPosition); + GUILayout.Label("Here you can allocate R&D teams to working on improving your hardware.\nMouse over for help."); +// tfScenario.userSettings.currentResearchScrollPosition = GUILayout.BeginScrollView(tfScenario.userSettings.currentResearchScrollPosition); break; case 1: if (ddlSettingsPage == null) diff --git a/TestFlightCore/TestFlightCore/TestFlightWindow.cs b/TestFlightCore/TestFlightCore/TestFlightWindow.cs index ee889ef1..6dab7054 100644 --- a/TestFlightCore/TestFlightCore/TestFlightWindow.cs +++ b/TestFlightCore/TestFlightCore/TestFlightWindow.cs @@ -123,6 +123,7 @@ internal override void OnGUIOnceOnly() Styles.InitStyles(); Styles.InitSkins(); SkinsLibrary.SetCurrent("SolarizedDark"); + SkinsLibrary.CurrentSkin.label.wordWrap = false; } internal void CalculateWindowBounds() @@ -145,7 +146,7 @@ internal void CalculateWindowBounds() windowWidth -= 100f; float left = Screen.width - windowWidth; - float windowHeight = 10f;; + float windowHeight = 10f; float top = 40f; if (tfScenario.userSettings.currentMSDSize == 0)