Turn DMF properties into DMFProperty types

OpenDreamClient/Interface/BrowsePopup.cs

@@ -20,13 +20,13 @@ public BrowsePopup(
         WindowDescriptor popupWindowDescriptor = new WindowDescriptor(name,
             new() {
                 new ControlDescriptorBrowser {
-                    Id = "browser",
-                    Size = size,
-                    Anchor1 = new Vector2i(0, 0),
-                    Anchor2 = new Vector2i(100, 100)
+                    Id = new DMFPropertyString("browser"),
+                    Size = new DMFPropertyVec2(size),
+                    Anchor1 = new DMFPropertyVec2(0, 0),
+                    Anchor2 = new DMFPropertyVec2(100, 100)
                 }
             }) {
-                Size = size
+                Size = new DMFPropertyVec2(size)
             };
 
         WindowElement = new ControlWindow(popupWindowDescriptor);

OpenDreamClient/Interface/Controls/ControlBar.cs

@@ -20,13 +20,13 @@ protected override void UpdateElementDescriptor() {
         base.UpdateElementDescriptor();
 
         //width
-        float barWidth = BarDescriptor.Width ?? 10f;
+        float barWidth = BarDescriptor.Width.Value;
 
         //TODO dir - these both need RT level changes
         //TODO angles
 
         //is-slider
-        if (BarDescriptor.IsSlider) {
+        if (BarDescriptor.IsSlider.Value) {
             if (_slider is null) {
                 _slider = new Slider {
                     MaxValue = 100,
@@ -35,7 +35,7 @@ protected override void UpdateElementDescriptor() {
                     HorizontalExpand = true,
                     VerticalExpand = (barWidth == 0f),
                     MinHeight = barWidth,
-                    Value = BarDescriptor.Value ?? 0.0f
+                    Value = BarDescriptor.Value.Value
                 };
 
                 _slider.OnValueChanged += OnValueChanged;
@@ -47,12 +47,12 @@ protected override void UpdateElementDescriptor() {
 
                 _container.AddChild(_slider);
             } else {
-                _slider.Value = BarDescriptor.Value ?? 0.0f;
+                _slider.Value = BarDescriptor.Value.Value;
             }
 
             //bar-color
             if (_slider.TryGetStyleProperty<StyleBoxFlat>(Slider.StylePropertyGrabber, out var box)) {
-                box.BackgroundColor = BarDescriptor.BarColor ?? Color.Transparent;
+                box.BackgroundColor = BarDescriptor.BarColor.Value;
                 _slider.GrabberStyleBoxOverride = box;
             }
         } else {
@@ -64,7 +64,7 @@ protected override void UpdateElementDescriptor() {
                     HorizontalExpand = true,
                     VerticalExpand = (barWidth == 0f),
                     MinHeight = barWidth,
-                    Value = BarDescriptor.Value ?? 0.0f
+                    Value = BarDescriptor.Value.Value
                 };
 
                 _bar.OnValueChanged += OnValueChanged;
@@ -76,12 +76,12 @@ protected override void UpdateElementDescriptor() {
 
                 _container.AddChild(_bar);
             } else {
-                _bar.Value = BarDescriptor.Value ?? 0.0f;
+                _bar.Value = BarDescriptor.Value.Value;
             }
 
             //bar-color
             if (_bar.TryGetStyleProperty<StyleBoxFlat>(ProgressBar.StylePropertyForeground, out var box)) {
-                box.BackgroundColor = BarDescriptor.BarColor ?? Color.Transparent;
+                box.BackgroundColor = BarDescriptor.BarColor.Value;
                 _bar.ForegroundStyleBoxOverride = box;
             }
         }
@@ -93,9 +93,9 @@ private void OnValueChanged(Robust.Client.UserInterface.Controls.Range range) {
         //if (_slider is not null && _slider.Grabbed)
         //    return;
 
-        if (BarDescriptor.OnChange != null) {
+        if (!string.IsNullOrEmpty(BarDescriptor.OnChange.Value)) {
             var valueReplaced =
-                BarDescriptor.OnChange.Replace("[[*]]", range.Value.ToString(CultureInfo.InvariantCulture));
+                BarDescriptor.OnChange.Value.Replace("[[*]]", range.Value.ToString(CultureInfo.InvariantCulture));
 
             _interfaceManager.RunCommand(valueReplaced);
         }

OpenDreamClient/Interface/Controls/ControlBrowser.cs

@@ -54,7 +54,7 @@ protected override Control CreateUIElement() {
             }
         };
 
-        if(ControlDescriptor.IsVisible)
+        if(ControlDescriptor.IsVisible.Value)
             OnShowEvent();
         else
             OnHideEvent();
@@ -165,15 +165,15 @@ private void HandleEmbeddedWinset(string query) {
 
     private void OnShowEvent() {
         ControlDescriptorBrowser controlDescriptor = (ControlDescriptorBrowser)ControlDescriptor;
-        if (!string.IsNullOrWhiteSpace(controlDescriptor.OnShowCommand)) {
-            _interfaceManager.RunCommand(controlDescriptor.OnShowCommand);
+        if (!string.IsNullOrWhiteSpace(controlDescriptor.OnShowCommand.Value)) {
+            _interfaceManager.RunCommand(controlDescriptor.OnShowCommand.AsRaw());
         }
     }
 
     private void OnHideEvent() {
         ControlDescriptorBrowser controlDescriptor = (ControlDescriptorBrowser)ControlDescriptor;
-        if (!string.IsNullOrWhiteSpace(controlDescriptor.OnHideCommand)) {
-            _interfaceManager.RunCommand(controlDescriptor.OnHideCommand);
+        if (!string.IsNullOrWhiteSpace(controlDescriptor.OnHideCommand.Value)) {
+            _interfaceManager.RunCommand(controlDescriptor.OnHideCommand.AsRaw());
         }
     }
 }

OpenDreamClient/Interface/Controls/ControlButton.cs

@@ -27,14 +27,14 @@ protected override void UpdateElementDescriptor() {
 
         ControlDescriptorButton controlDescriptor = (ControlDescriptorButton)ElementDescriptor;
 
-        _button.Text = controlDescriptor.Text;
+        _button.Text = controlDescriptor.Text.AsRaw();
     }
 
     private void OnButtonClick(BaseButton.ButtonEventArgs args) {
         ControlDescriptorButton controlDescriptor = (ControlDescriptorButton)ElementDescriptor;
 
-        if (controlDescriptor.Command != null) {
-            _interfaceManager.RunCommand(controlDescriptor.Command);
+        if (!string.IsNullOrEmpty(controlDescriptor.Command.Value)) {
+            _interfaceManager.RunCommand(controlDescriptor.Command.AsRaw());
         }
     }
 }

OpenDreamClient/Interface/Controls/ControlChild.cs

@@ -1,4 +1,5 @@
-using OpenDreamClient.Interface.Descriptors;
+using System.Diagnostics.CodeAnalysis;
+using OpenDreamClient.Interface.Descriptors;
 using Robust.Client.UserInterface;
 using Robust.Client.UserInterface.Controls;
 
@@ -23,10 +24,10 @@ protected override Control CreateUIElement() {
     protected override void UpdateElementDescriptor() {
         base.UpdateElementDescriptor();
 
-        var newLeftElement = ChildDescriptor.Left != null && _interfaceManager.Windows.TryGetValue(ChildDescriptor.Left, out var leftWindow)
+        var newLeftElement = ChildDescriptor.Left.Value != null && _interfaceManager.Windows.TryGetValue(ChildDescriptor.Left.Value, out var leftWindow)
             ? leftWindow.UIElement
             : null;
-        var newRightElement = ChildDescriptor.Right != null && _interfaceManager.Windows.TryGetValue(ChildDescriptor.Right, out var rightWindow)
+        var newRightElement = ChildDescriptor.Right.Value != null && _interfaceManager.Windows.TryGetValue(ChildDescriptor.Right.Value, out var rightWindow)
             ? rightWindow.UIElement
             : null;
 
@@ -71,27 +72,27 @@ protected override void UpdateElementDescriptor() {
     }
 
     public override void Shutdown() {
-        if (ChildDescriptor.Left != null && _interfaceManager.Windows.TryGetValue(ChildDescriptor.Left, out var left))
+        if (ChildDescriptor.Left.Value != null && _interfaceManager.Windows.TryGetValue(ChildDescriptor.Left.Value, out var left))
             left.Shutdown();
-        if (ChildDescriptor.Right != null && _interfaceManager.Windows.TryGetValue(ChildDescriptor.Right, out var right))
+        if (ChildDescriptor.Right.Value != null && _interfaceManager.Windows.TryGetValue(ChildDescriptor.Right.Value, out var right))
             right.Shutdown();
     }
 
     private void UpdateGrid() {
-        _grid.Orientation = ChildDescriptor.IsVert
+        _grid.Orientation = ChildDescriptor.IsVert.Value
             ? SplitContainer.SplitOrientation.Horizontal
             : SplitContainer.SplitOrientation.Vertical;
 
         if (_grid.Size == Vector2.Zero)
             return;
 
-        _grid.SplitFraction = ChildDescriptor.Splitter / 100f;
+        _grid.SplitFraction = ChildDescriptor.Splitter.Value / 100f;
     }
 
-    public override bool TryGetProperty(string property, out string value) {
+    public override bool TryGetProperty(string property, [NotNullWhen(true)] out DMFProperty? value) {
         switch (property) {
             case "splitter":
-                value = $"{_grid.SplitFraction * 100}";
+                value = new DMFPropertyNum(_grid.SplitFraction * 100);
                 return true;
             default:
                 return base.TryGetProperty(property, out value);

OpenDreamClient/Interface/Controls/ControlInfo.cs

@@ -68,7 +68,7 @@ public void UpdateLabels(string name, string value, string? atomRef) {
             _nameText.PushTag(new MarkupNode("font", null, null));
             _valueText.PushTag(new MarkupNode("font", null, null));
 
-            if (_owner.InfoDescriptor.AllowHtml) {
+            if (_owner.InfoDescriptor.AllowHtml.Value) {
                 // TODO: Look into using RobustToolbox's markup parser once it's customizable enough
                 HtmlParser.Parse(name, _nameText);
                 HtmlParser.Parse(value, _valueText);
@@ -219,7 +219,7 @@ protected override Control CreateUIElement() {
             }
         };
 
-        if(ControlDescriptor.IsVisible)
+        if(ControlDescriptor.IsVisible.Value)
             OnShowEvent();
         else
             OnHideEvent();
@@ -316,15 +316,15 @@ private void OnSelectionChanged(int tabIndex) {
 
     public void OnShowEvent() {
         ControlDescriptorInfo controlDescriptor = (ControlDescriptorInfo)ControlDescriptor;
-        if (!string.IsNullOrWhiteSpace(controlDescriptor.OnShowCommand)) {
-            _interfaceManager.RunCommand(controlDescriptor.OnShowCommand);
+        if (!string.IsNullOrWhiteSpace(controlDescriptor.OnShowCommand.Value)) {
+            _interfaceManager.RunCommand(controlDescriptor.OnShowCommand.AsRaw());
         }
     }
 
     public void OnHideEvent() {
         ControlDescriptorInfo controlDescriptor = (ControlDescriptorInfo)ControlDescriptor;
-        if (!string.IsNullOrWhiteSpace(controlDescriptor.OnHideCommand)) {
-            _interfaceManager.RunCommand(controlDescriptor.OnHideCommand);
+        if (!string.IsNullOrWhiteSpace(controlDescriptor.OnHideCommand.Value)) {
+            _interfaceManager.RunCommand(controlDescriptor.OnHideCommand.AsRaw());
         }
     }
 }

OpenDreamClient/Interface/Controls/ControlInput.cs

@@ -1,4 +1,5 @@
-using OpenDreamClient.Interface.Descriptors;
+using System.Diagnostics.CodeAnalysis;
+using OpenDreamClient.Interface.Descriptors;
 using Robust.Client.UserInterface;
 using Robust.Client.UserInterface.Controls;
 
@@ -23,13 +24,13 @@ private void TextBox_OnSubmit(LineEdit.LineEditEventArgs lineEditEventArgs) {
     protected override void UpdateElementDescriptor() {
         base.UpdateElementDescriptor();
         ControlDescriptorInput inputDescriptor = (ControlDescriptorInput)ElementDescriptor;
-        _textBox.Text = inputDescriptor.Text ?? "";
+        _textBox.Text = inputDescriptor.Text.AsRaw();
     }
 
-    public override bool TryGetProperty(string property, out string value) {
+    public override bool TryGetProperty(string property, [NotNullWhen(true)] out DMFProperty? value) {
         switch (property) {
             case "text":
-                value = _textBox.Text;
+                value = new DMFPropertyString(_textBox.Text);
                 return true;
             default:
                 return base.TryGetProperty(property, out value);

OpenDreamClient/Interface/Controls/ControlLabel.cs

@@ -22,6 +22,6 @@ protected override void UpdateElementDescriptor() {
         base.UpdateElementDescriptor();
 
         ControlDescriptorLabel controlDescriptor = (ControlDescriptorLabel)ElementDescriptor;
-        _label.Text = controlDescriptor.Text;
+        _label.Text = controlDescriptor.Text.AsRaw();
     }
 }

OpenDreamClient/Interface/Controls/ControlMap.cs

@@ -19,7 +19,7 @@ public sealed class ControlMap(ControlDescriptor controlDescriptor, ControlWindo
     protected override void UpdateElementDescriptor() {
         base.UpdateElementDescriptor();
 
-        Viewport.StretchMode = MapDescriptor.ZoomMode switch {
+        Viewport.StretchMode = MapDescriptor.ZoomMode.Value switch {
             "blur" => ScalingViewportStretchMode.Bilinear,
             "distort" => ScalingViewportStretchMode.Nearest,
 
@@ -36,9 +36,9 @@ public void UpdateViewRange(ViewRange view) {
         var viewHeight = Math.Max(view.Height, 1);
 
         Viewport.ViewportSize = new Vector2i(viewWidth, viewHeight) * EyeManager.PixelsPerMeter;
-        if (MapDescriptor.IconSize != 0) {
+        if (MapDescriptor.IconSize.Value != 0) {
             // BYOND supports a negative number here (flips the view), but we're gonna enforce a positive number instead
-            var iconSize = Math.Max(MapDescriptor.IconSize, 1);
+            var iconSize = Math.Max(MapDescriptor.IconSize.Value, 1);
 
             Viewport.SetWidth = iconSize * viewWidth;
             Viewport.SetHeight = iconSize * viewHeight;
@@ -60,7 +60,7 @@ protected override Control CreateUIElement() {
                 OnHideEvent();
             }
         };
-        if(ControlDescriptor.IsVisible)
+        if(ControlDescriptor.IsVisible.Value)
             OnShowEvent();
         else
             OnHideEvent();
@@ -83,15 +83,15 @@ private void OnViewportKeyBindEvent(GUIBoundKeyEventArgs e) {
 
     public void OnShowEvent() {
         ControlDescriptorMap controlDescriptor = (ControlDescriptorMap)ControlDescriptor;
-        if (!string.IsNullOrWhiteSpace(controlDescriptor.OnShowCommand)) {
-            _interfaceManager.RunCommand(controlDescriptor.OnShowCommand);
+        if (!string.IsNullOrWhiteSpace(controlDescriptor.OnShowCommand.Value)) {
+            _interfaceManager.RunCommand(controlDescriptor.OnShowCommand.AsRaw());
         }
     }
 
     public void OnHideEvent() {
         ControlDescriptorMap controlDescriptor = (ControlDescriptorMap)ControlDescriptor;
-        if (!string.IsNullOrWhiteSpace(controlDescriptor.OnHideCommand)) {
-            _interfaceManager.RunCommand(controlDescriptor.OnHideCommand);
+        if (!string.IsNullOrWhiteSpace(controlDescriptor.OnHideCommand.Value)) {
+            _interfaceManager.RunCommand(controlDescriptor.OnHideCommand.AsRaw());
         }
     }
 }

OpenDreamClient/Interface/Controls/ControlTab.cs

@@ -1,3 +1,4 @@
+using System.Diagnostics.CodeAnalysis;
 using System.Linq;
 using OpenDreamClient.Interface.Descriptors;
 using Robust.Client.UserInterface;
@@ -23,8 +24,8 @@ protected override void UpdateElementDescriptor() {
 
         _tabs.Clear();
         _tab.RemoveAllChildren();
-        if (TabDescriptor.Tabs != null) {
-            var tabIds = TabDescriptor.Tabs.Split(',',
+        if (TabDescriptor.Tabs.Value != null) {
+            var tabIds = TabDescriptor.Tabs.Value.Split(',',
                 StringSplitOptions.TrimEntries | StringSplitOptions.RemoveEmptyEntries);
 
             foreach (var tabId in tabIds) {
@@ -34,13 +35,13 @@ protected override void UpdateElementDescriptor() {
                 TabContainer.SetTabTitle(pane.UIElement, pane.Title);
                 _tab.AddChild(pane.UIElement);
                 _tabs.Add(pane);
-                if (TabDescriptor.CurrentTab == pane.Title)
+                if (TabDescriptor.CurrentTab.Value == pane.Title)
                     _tab.CurrentTab = pane.UIElement.GetPositionInParent();
             }
         }
     }
 
-    public override bool TryGetProperty(string property, out string value) {
+    public override bool TryGetProperty(string property, [NotNullWhen(true)] out DMFProperty? value) {
         switch (property) {
             case "current-tab":
                 var currentTab = _tab.GetChild(_tab.CurrentTab);