Merge branch 'master' into readonlymethods

OpenDreamProject · Oct 20, 2024 · d13718d · d13718d
2 parents 4375897 + 87fe63d
commit d13718d
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 1 deletion.
diff --git a/Content.Tests/DMProject/Tests/Regex/regex_L_brackets.dm b/Content.Tests/DMProject/Tests/Regex/regex_L_brackets.dm
@@ -0,0 +1,5 @@
+
+/proc/RunTest()
+	var/static/regex/repeated_consonant_regex = regex(@"\b([^aeiou\L])\1", "gi")
+	var/words = "hey... ggggurl"
+	ASSERT(repeated_consonant_regex.Find(words) == 8)
diff --git a/OpenDreamClient/Interface/Controls/ControlWindow.cs b/OpenDreamClient/Interface/Controls/ControlWindow.cs
@@ -336,7 +336,11 @@ public override void SetProperty(string property, string value, bool manualWinse
         switch (property) {
             case "size":
                 if (_myWindow.osWindow is {ClydeWindow: not null}) {
-                    _myWindow.osWindow.ClydeWindow.Size = new DMFPropertySize(value).Vector;
+                    var size = new DMFPropertySize(value);
+                    var uiScale = _myWindow.osWindow.UIScale;
+                    size.X = (int)(size.X * uiScale); // TODO: RT should probably do this itself
+                    size.Y = (int)(size.Y * uiScale);
+                    _myWindow.osWindow.ClydeWindow.Size = size.Vector;
                 }
 
                 return;