New enhancment: Now you can use Escape key to close Traffic Manager without returning to Pause Menu

Author: krzychu124

README.md

@@ -4,6 +4,10 @@ A modification for **Cities: Skylines** to add additional traffic control.
 User manual: http://www.viathinksoft.de/tmpe/wiki
 
 # Changelog
+1.10.15,
+- Enhancement: Now you can use Escape key to close Traffic Manager without returning to Pause Menu
+- Updated pathfinding with missing vanilla logic
+
 1.10.14, 27/01/2019
 - Bugfix: Added missing Car AI type (postVanAI) - now post vans and post trucks are assigned to service vehicles group 
 - Bugfix: Vehicles doesn't stop when driving through toll booth - fixes toll booth income too

TLM/TLM/TLM.csproj

@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
   <PropertyGroup>
@@ -205,6 +205,7 @@
     <Compile Include="Custom\PathFinding\CustomPathManager.cs" />
     <Compile Include="Geometry\Impl\SegmentGeometry.cs" />
     <Compile Include="LoadingExtension.cs" />
+    <Compile Include="UI\CustomKeyHandler.cs" />
     <Compile Include="UI\RemoveCitizenInstanceButtonExtender.cs" />
     <Compile Include="UI\RemoveVehicleButtonExtender.cs" />
     <Compile Include="UI\MainMenu\LaneConnectorButton.cs" />

TLM/TLM/UI/CustomKeyHandler.cs

@@ -0,0 +1,17 @@
+using ColossalFramework.UI;
+using CSUtil.Commons;
+using UnityEngine;
+
+namespace TrafficManager.UI {
+    public class CustomKeyHandler : UICustomControl {
+        //TODO add more key bindings or refactor to mod key shortcut manager
+        
+        public void OnKeyDown(UIComponent comp, UIKeyEventParameter p)
+        {
+            if (p.used || p.keycode != KeyCode.Escape)
+                return;
+            Log._Debug("CustomKeyHandler::OnKeyDown(KeyCode.Escape) call");
+            p.Use();
+        }
+    }
+}

TLM/TLM/UI/UIBase.cs

@@ -43,6 +43,7 @@ public UIBase() {
 
 			// add the menu
 			MainMenu = (MainMenuPanel)uiView.AddUIComponent(typeof(MainMenuPanel));
+			MainMenu.gameObject.AddComponent<CustomKeyHandler>();
 #if DEBUG
 			DebugMenu = (DebugMenuPanel)uiView.AddUIComponent(typeof(DebugMenuPanel));
 #endif
@@ -52,6 +53,9 @@ public UIBase() {
 
 		~UIBase() {
 			UnityEngine.Object.Destroy(MainMenuButton);
+			CustomKeyHandler keyHandler = MainMenu.GetComponent<CustomKeyHandler>();
+			if(keyHandler != null)
+				UnityEngine.Object.Destroy(keyHandler);
 		}
 
 		public bool IsVisible() {
@@ -68,13 +72,18 @@ public void ToggleMainMenu() {
 		internal void RebuildMenu() {
 			Close();
 			if (MainMenu != null) {
+				CustomKeyHandler keyHandler = MainMenu.GetComponent<CustomKeyHandler>();
+				if(keyHandler != null)
+				UnityEngine.Object.Destroy(keyHandler);
+				
 				UnityEngine.Object.Destroy(MainMenu);
 #if DEBUG
 				UnityEngine.Object.Destroy(DebugMenu);
 #endif
 			}
 			var uiView = UIView.GetAView();
 			MainMenu = (MainMenuPanel)uiView.AddUIComponent(typeof(MainMenuPanel));
+			MainMenu.gameObject.AddComponent<CustomKeyHandler>();
 #if DEBUG
 			DebugMenu = (DebugMenuPanel)uiView.AddUIComponent(typeof(DebugMenuPanel));
 #endif
@@ -99,6 +108,7 @@ public void Show() {
 			SetToolMode(TrafficManagerMode.Activated);
 			_uiShown = true;
 			MainMenuButton.UpdateSprites();
+			UIView.SetFocus(MainMenu);
 		}
 
 		public void Close() {