Skip to content

Make macro optional #2464

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

Open
ike709 wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Make macro optional #2464

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 1 addition & 1 deletion OpenDreamClient/DreamClientSystem.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,6 @@ public override void Initialize() {
private void OnPlayerAttached(LocalPlayerAttachedEvent e) {
// The active input context gets reset to "common" when a new player is attached
// So we have to set it again
_interfaceManager.DefaultWindow?.Macro.SetActive();
_interfaceManager.DefaultWindow?.Macro?.SetActive();
}
}
4 changes: 2 additions & 2 deletions OpenDreamClient/Interface/Controls/ControlWindow.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ public sealed class ControlWindow : InterfaceControl {
public readonly List<InterfaceControl> ChildControls = new();

public string Title => WindowDescriptor.Title.Value;
public InterfaceMacroSet Macro => _interfaceManager.MacroSets[WindowDescriptor.Macro.AsRaw()];
public InterfaceMacroSet? Macro => _interfaceManager.MacroSets.GetValueOrDefault(WindowDescriptor.Macro.AsRaw());

private WindowDescriptor WindowDescriptor => (WindowDescriptor)ElementDescriptor;

Expand Down Expand Up @@ -54,7 +54,7 @@ protected override void UpdateElementDescriptor() {
UpdateWindowAttributes(_myWindow);

if (WindowDescriptor.IsDefault.Value) {
Macro.SetActive();
Macro?.SetActive();
Copy link
Copy Markdown
Member

@wixoaGit wixoaGit Mar 7, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This would leave the previous macro set as the active one if macro is removed through winset.

I would also like to test if BYOND has a default macro set for this case.

}
}

Expand Down
Loading