Fixes after merge with Master

Author: kvakvs

TLM/TLM/UI/SubTools/JunctionRestrictionsTool.cs

@@ -2,18 +2,16 @@ namespace TrafficManager.UI.SubTools {
     using ColossalFramework;
     using CSUtil.Commons;
     using System.Collections.Generic;
-    using TrafficManager.API.Manager;
     using TrafficManager.Manager.Impl;
     using TrafficManager.State.ConfigData;
     using TrafficManager.State;
-    using TrafficManager.UI.Textures;
     using UnityEngine;
     using TrafficManager.State.Keybinds;
     using TrafficManager.UI.SubTools.PrioritySigns;
-    using TrafficManager.UI.MainMenu.OSD;
     using TrafficManager.Util;
     using static TrafficManager.Util.Shortcuts;
     using TrafficManager.UI.Helpers;
+    using TrafficManager.UI.MainMenu.OSD;
 
     public class JunctionRestrictionsTool
         : LegacySubTool,
@@ -216,5 +214,33 @@ private void RefreshCurrentRestrictedNodeIds(ushort forceNodeId = 0) {
                 }
             }
         }
-    }
+
+        private static string T(string key) => Translation.JunctionRestrictions.Get(key);
+
+        public void UpdateOnscreenDisplayPanel() {
+            if (SelectedNodeId == 0) {
+                // Select mode
+                var items = new List<OsdItem>();
+                items.Add(
+                    new UI.MainMenu.OSD.ModeDescription(
+                        localizedText: T("JR.OnscreenHint.Mode:Select")));
+                OnscreenDisplay.Display(items);
+                return;
+            } else {
+                // Edit mode
+                var items = new List<OsdItem>();
+                items.Add(
+                    new UI.MainMenu.OSD.Shortcut(
+                        keybindSetting: KeybindSettingsBase.LaneConnectorDelete,
+                        localizedText: T("JR.OnscreenHint.Reset:Reset to default")));
+
+                items.Add(OnscreenDisplay.RightClick_LeaveNode());
+                OnscreenDisplay.Display(items);
+                return;
+            }
+
+            // Default: no hint
+            // OnscreenDisplay.Clear();
+        }
+    } // end class
 }

TLM/TLM/UI/SubTools/SpeedLimits/SpeedLimitsTool.cs

@@ -126,19 +126,19 @@ public override void OnToolGUI(Event e) {
                                           : 8 * (GUI_SPEED_SIGN_SIZE + 5);
 
             paletteWindowRect = GUILayout.Window(
-                254,
-                paletteWindowRect,
-                GuiSpeedLimitsWindow,
-                Translation.Menu.Get("Tooltip:Speed limits") + unitTitle,
-                WindowStyle);
+                id: 254,
+                screenRect: paletteWindowRect,
+                func: GuiSpeedLimitsWindow,
+                text: Translation.Menu.Get("Tooltip:Speed limits") + unitTitle,
+                style: WindowStyle);
 
             if (defaultsWindowVisible) {
                 defaultsWindowRect = GUILayout.Window(
-                    258,
-                    defaultsWindowRect,
-                    GuiDefaultsWindow,
-                    Translation.SpeedLimits.Get("Window.Title:Default speed limits"),
-                    WindowStyle);
+                    id: 258,
+                    screenRect: defaultsWindowRect,
+                    func: GuiDefaultsWindow,
+                    text: Translation.SpeedLimits.Get("Window.Title:Default speed limits"),
+                    style: WindowStyle);
             }
 
             cursorInSecondaryPanel = paletteWindowRect.Contains(Event.current.mousePosition)