Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Tools GUI windows - disable click through UI background #1443

Merged
merged 7 commits into from
Mar 4, 2022
Merged

Tools GUI windows - disable click through UI background #1443

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
c73c20d
Block clicks on menu buttons through toow gui windows and overlay signs
krzychu124 Feb 28, 2022
46301b6
what's new NullReferenceException on opening TMPE menu with default G…
krzychu124 Feb 28, 2022
1026845
Merge branch 'master' into bugfix/934-gui-window-disable-cursor-clicks
originalfoo Mar 2, 2022
4a11d2b
Merge branch 'master' into bugfix/934-gui-window-disable-cursor-clicks
originalfoo Mar 2, 2022
e146d95
Merge branch 'master' into bugfix/934-gui-window-disable-cursor-clicks
krzychu124 Mar 3, 2022
bfd3ac3
Added short description and CanBeNull attribute
krzychu124 Mar 4, 2022
96690eb
fix typo
krzychu124 Mar 4, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions TLM/TLM/UI/Helpers/Highlight.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
namespace TrafficManager.UI.Helpers {
using ColossalFramework;
using ColossalFramework.Math;
using ColossalFramework.UI;
using TrafficManager.Util;
using TrafficManager.Util.Extensions;
using UnityEngine;
Expand Down Expand Up @@ -384,6 +385,10 @@ public static bool DrawGenericOverlayTexture(Texture2D texture,
GUI.color = guiColor;
GUI.DrawTexture(screenRect, texture);

if (hovered) {
UIInput.MouseUsed();
}

return hovered;
}
}
Expand Down
6 changes: 6 additions & 0 deletions TLM/TLM/UI/SubTools/TimedTrafficLights/TimedTrafficLightsTool.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -333,6 +333,10 @@ public override void OnToolGUI(Event e) {
break;
}
}

if (_cursorInSecondaryPanel) {
UIInput.MouseUsed();
}
}

public override void RenderOverlay(RenderManager.CameraInfo cameraInfo) {
Expand Down Expand Up @@ -2550,6 +2554,8 @@ ref nodeId.ToNode(),
if (!hoveredSegment) {
_hoveredButton[0] = 0;
_hoveredButton[1] = 0;
} else {
UIInput.MouseUsed();
}
}

Expand Down
5 changes: 5 additions & 0 deletions TLM/TLM/UI/SubTools/VehicleRestrictionsTool.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ namespace TrafficManager.UI.SubTools {
using ColossalFramework;
using static Util.SegmentLaneTraverser;
using System.Collections.Generic;
using ColossalFramework.UI;
using TrafficManager.API.Traffic.Enums;
using TrafficManager.Manager.Impl;
using TrafficManager.State;
Expand Down Expand Up @@ -163,6 +164,10 @@ public override void OnToolGUI(Event e) {
// overlayHandleHovered = false;
}

if (cursorInSecondaryPanel) {
UIInput.MouseUsed();
}

// ShowSigns(false);
}

Expand Down
2 changes: 1 addition & 1 deletion TLM/TLM/UI/WhatsNew/WhatsNew.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ public static Version PreviouslySeenVersion {
}
}

public bool Shown => PreviouslySeenVersion >= CurrentVersion;
public bool Shown => CurrentVersion <= PreviouslySeenVersion;
krzychu124 marked this conversation as resolved.
Show resolved Hide resolved

public List<Changelog> Changelogs { get; private set; }

Expand Down