Changes and fixes

TotemArts · Jan 7, 2023 · afd9751 · afd9751
1 parent 7b5adba
commit afd9751
Show file tree

Hide file tree

Showing 11 changed files with 66 additions and 27 deletions.
diff --git a/backend/.vscode/launch.json b/backend/.vscode/launch.json
@@ -0,0 +1,47 @@
+{
+    // Use IntelliSense to learn about possible attributes.
+    // Hover to view descriptions of existing attributes.
+    // For more information, visit: https://go.microsoft.com/fwlink/?linkid=830387
+    "version": "0.2.0",
+    "configurations": [
+        {
+            "type": "lldb",
+            "request": "launch",
+            "name": "Debug executable 'renegade-x-launcher'",
+            "cargo": {
+                "args": [
+                    "build",
+                    "--target=i686-pc-windows-gnu",
+                    "--bin=renegade-x-launcher",
+                    "--package=renegade-x-launcher"
+                ],
+                "filter": {
+                    "name": "renegade-x-launcher",
+                    "kind": "bin"
+                }
+            },
+            "args": [],
+            "cwd": "${workspaceFolder}"
+        },
+        {
+            "type": "lldb",
+            "request": "launch",
+            "name": "Debug unit tests in executable 'renegade-x-launcher'",
+            "cargo": {
+                "args": [
+                    "test",
+                    "--target=i686-pc-windows-gnu",
+                    "--no-run",
+                    "--bin=renegade-x-launcher",
+                    "--package=renegade-x-launcher"
+                ],
+                "filter": {
+                    "name": "renegade-x-launcher",
+                    "kind": "bin"
+                }
+            },
+            "args": [],
+            "cwd": "${workspaceFolder}"
+        }
+    ]
+}
diff --git a/backend/.vscode/settings.json b/backend/.vscode/settings.json
@@ -0,0 +1,4 @@
+{
+    "cross-rust-analyzer.target": "i686-pc-windows-gnu",
+    "lldb.cargo": "cross"
+}
diff --git a/backend/Cargo.toml b/backend/Cargo.toml
@@ -25,7 +25,7 @@ log = "0.4"
 download-async = "0.10"
 async-trait = "0.1"
 json = "0.12"
-quick-xml = { version="0.26" }
+quick-xml = { version="0.27" }
 semver = "1.0"
 console-subscriber="0.1.8"
 tracing-subscriber="0.3"

diff --git a/compile with cross.bat b/compile with cross.bat
@@ -1,5 +1,5 @@
 cd backend
-cross update
+cargo update
 cross build --release --target=i686-pc-windows-gnu
 cd ..
 echo F|xcopy /Y backend\target\i686-pc-windows-gnu\release\renegade-x-launcher.exe RenegadeX-Launcher.exe

diff --git a/dom/chat.css b/dom/chat.css
@@ -3,10 +3,6 @@
   width: *;
 }
 
-menu.chat_menu {
-  aspect: "Emu.chat_menu";
-}
-
 div.chat {
   height: *;
   min-height: 200dip;

diff --git a/dom/containers.css b/dom/containers.css
@@ -165,10 +165,6 @@ div.titlebar > .title {
   height: *;
 }
 
-.footer-margin {
-  aspect: "footer_progress";
-}
-
 .join_server {
   min-width: 600dip;
   max-width: 700dip;
@@ -240,6 +236,10 @@ div.titlebar > .title {
   height: *;
 }
 
+.mwidth {
+  width: *;
+}
+
 .menu {
   position: absolute;
   bottom: 17dip;

diff --git a/dom/elements.css b/dom/elements.css
@@ -31,11 +31,6 @@ output {
   text-overflow:inherit;
   text-transform: inherit;
   white-space: inherit;
-  aspect: "Emu.loadOutput";
-}
-
-progressbar {
-  aspect: "Emu.loadOutput";
 }
 
 input|text {
@@ -64,7 +59,6 @@ input|text {
 #map_video {
   width: 320;
   height: 180;
-  aspect: "Emu.videoHandler";
 }
 
 input|text.searchbar {
@@ -120,7 +114,6 @@ button.bool {
   background-position: 10dip center;
   background-repeat: no-repeat;
   background-size: auto 10dip;
-  aspect: "bool_setting";
 }
 
 button.bool.true {
@@ -293,7 +286,6 @@ button#update, button#launch {
   background-position: center;
   background-repeat: no-repeat;
   background-size: auto 12dip;
-  aspect: "filter";
   cursor: pointer;
 }
 
@@ -487,11 +479,11 @@ table.servers {
   }
   table:root > tbody > tr > td:nth-child(1) { max-width:5dip; color: rgba(0,0,0,0)}
 
-  table:root > thead > tr > th:nth-child(1) { width:5dip; }
-  table:root > thead > tr > th:nth-child(2) { width:50%; }
-  table:root > thead > tr > th:nth-child(3) { width:21%; }
-  table:root > thead > tr > th:nth-child(4) { width:12%; }
-  table:root > thead > tr > th:nth-child(5) { width:12%; }
+  table:root > thead > tr > th:nth-child(1) { width: 5dip; }
+  table:root > thead > tr > th:nth-child(2) { width: *; }
+  table:root > thead > tr > th:nth-child(3) { width: 150dip; }
+  table:root > thead > tr > th:nth-child(4) { width: 60dip; }
+  table:root > thead > tr > th:nth-child(5) { width: 60dip; }
 
   table:root th[order=ascend]  {
     foreground-image:url(stock:arrow-down);

diff --git a/dom/footer.js b/dom/footer.js
@@ -18,7 +18,7 @@ export class Footer extends Element {
     }
 
     get_progressbar_style(width) {
-        return printf("width:%s%%", width);
+        return printf("width:%s%%%%", width);
     }
 
     render(props) {

diff --git a/dom/modals/launcher-progress-modal.js b/dom/modals/launcher-progress-modal.js
@@ -4,7 +4,7 @@ export class LauncherProgressModal extends Element
     download_speed = "0";
 
     get_progressbar_style(width) {
-      return printf("width:%s%%", width);
+      return printf("width:%s%%%%", width);
     }
 
     render(props) {

diff --git a/dom/modals/progress-modal.js b/dom/modals/progress-modal.js
@@ -18,7 +18,7 @@ export class ProgressModal extends Element
     in_progress = false;
 
     get_progressbar_style(width) {
-      return printf("width:%s%%", width);
+      return printf("width:%s%%%%", width);
     }
 
     actionOrProgressbars() {

diff --git a/dom/servers.js b/dom/servers.js
@@ -401,7 +401,7 @@ export class Servers extends Element {
           <Slider {...this.server_list} />
           <checkmark class={"big" + (this.server_list.same_version ? " checked" : "")} toggle /><p class="nowrap">Same version</p>
         </div>
-        <div class="body mheight">
+        <div class="body mheight mwidth">
           <ServersTable />
         </div>
         <div class="titlebar">