Merge branch 'v2.0' of https://github.com/mercuryworkshop/anuraos int…

…o feat/xfrog2
MercuryWorkshop · Sep 28, 2024 · 8491c36 · 8491c36
2 parents 7026129 + 5bbad7d
commit 8491c36
Show file tree

Hide file tree

Showing 13 changed files with 48 additions and 47 deletions.
diff --git a/src/AliceWM.tsx b/src/AliceWM.tsx
@@ -1142,6 +1142,7 @@ class WMSplitBar {
             document.documentElement.clientWidth ||
             document.body.clientWidth;
         this.element.style.left = width / 2 - 4 + "px";
+        this.element.style.zIndex = getHighestZindex() + "";
         document.body.appendChild(this.element);
         setTimeout(() => {
             this.element.style.removeProperty("background-color");

diff --git a/src/coreapps/AboutApp.tsx b/src/coreapps/AboutApp.tsx
@@ -48,12 +48,10 @@ class AboutApp extends App {
                 <p>
                     This product is licensed under the{" "}
                     <button
-                        on:click={async () => {
-                            const browser =
-                                await anura.import("anura.libbrowser");
-                            browser.openTab(
+                        on:click={() => {
+                            anura.apps["anura.browser"].open([
                                 "https://github.com/MercuryWorkshop/anuraOS/blob/main/LICENSE",
-                            );
+                            ]);
                         }}
                         class="aboutapp-link-button"
                     >

diff --git a/src/coreapps/App.tsx b/src/coreapps/App.tsx
@@ -1,7 +1,7 @@
 class App {
-    icon: string;
-    package: string;
     name: string;
+    package: string;
+    icon: string;
     /**
      * This should be set to false by default because apps should
      * only be hidden if there is an explicit reason to do so

diff --git a/src/coreapps/Dialog.tsx b/src/coreapps/Dialog.tsx
@@ -6,6 +6,7 @@ class Dialog extends App {
     icon = "/assets/icons/generic.svg";
     source: string;
     hidden = true;
+
     css = css`
         margin: 16px;
         h2 {

diff --git a/src/coreapps/ExploreApp.tsx b/src/coreapps/ExploreApp.tsx
@@ -1,11 +1,8 @@
 class ExploreApp extends App {
+    name = "Explore";
+    package = "anura.explore";
+    icon = "/assets/icons/explore.png";
     hidden = false;
-    constructor() {
-        super();
-        this.name = "Explore";
-        this.icon = "/assets/icons/explore.png";
-        this.package = "anura.explore";
-    }
 
     css = css`
         background-color: var(--theme-bg);
@@ -134,6 +131,10 @@ class ExploreApp extends App {
         }
     `;
 
+    constructor() {
+        super();
+    }
+
     whatsnew = (
         <div id="body">
             <h1>What's new in AnuraOS {anura.version.pretty}?</h1>

diff --git a/src/coreapps/GenericApp.tsx b/src/coreapps/GenericApp.tsx
@@ -1,10 +1,10 @@
 class GenericApp extends App {
+    name = "Generic App";
+    package = "anura.generic";
+    icon = "/assets/icons/generic.svg";
     hidden = true;
     constructor() {
         super();
-        this.name = "Generic App";
-        this.icon = "/assets/icons/generic.svg";
-        this.package = "anura.generic";
     }
 
     async open(args: string[] = []): Promise<WMWindow | undefined> {

diff --git a/src/coreapps/RegEdit.tsx b/src/coreapps/RegEdit.tsx
@@ -16,7 +16,7 @@ const DisclosureGroup: Component<{
     if (!this.level) this.level = 1;
 
     this.css = `
-    padding-left: ${0.8 * this.level!}em;
+        padding-left: ${0.8 * this.level!}em;
     `;
 
     return (
@@ -75,13 +75,9 @@ const DisclosureGroup: Component<{
 };
 
 class RegEdit extends App {
-    hidden = false;
-    constructor() {
-        super();
-        this.name = "Registry Editor";
-        this.icon = "/assets/icons/regedit.svg";
-        this.package = "anura.regedit";
-    }
+    name = "Registry Editor";
+    package = "anura.regedit";
+    icon = "/assets/icons/regedit.svg";
 
     css = css`
         display: flex;
@@ -137,6 +133,11 @@ class RegEdit extends App {
             background-color: var(--theme-bg);
         }
     `;
+
+    constructor() {
+        super();
+    }
+
     state = $state({
         selected: anura.settings.cache,
     });

diff --git a/src/coreapps/SettingsApp.tsx b/src/coreapps/SettingsApp.tsx
@@ -250,14 +250,18 @@ class SettingsApp extends App {
     name = "Settings";
     package = "anura.settings";
     icon = "/assets/icons/settings.png";
+    win: WMWindow;
+
+    constructor() {
+        super();
+    }
 
     state = $state({
         show_x86_install: anura.settings.get("x86-disabled"),
         x86_installing: false,
         resizing: false,
         settingsBody: undefined as unknown as HTMLDivElement,
     });
-    win: WMWindow;
 
     page = async () => (
         <div
@@ -768,10 +772,6 @@ class SettingsApp extends App {
         </div>
     );
 
-    constructor() {
-        super();
-    }
-
     async open(): Promise<WMWindow | undefined> {
         if (this.win?.element?.parentElement) {
             return this.win;

diff --git a/src/coreapps/TaskManager.tsx b/src/coreapps/TaskManager.tsx
@@ -1,11 +1,8 @@
 // probably some of the most clusterfucked code i've written - fish
 class TaskManager extends App {
-    constructor() {
-        super();
-        this.name = "Task Manager";
-        this.icon = "/assets/icons/system-monitor.svg";
-        this.package = "anura.taskmgr";
-    }
+    name = "Task Manager";
+    package = "anura.taskmgr";
+    icon = "/assets/icons/system-monitor.svg";
 
     // incomprehensible css
     css = css`
@@ -137,6 +134,10 @@ class TaskManager extends App {
         }
     `;
 
+    constructor() {
+        super();
+    }
+
     state = $state({
         selected: -1, // TODO: Multiselect. Shouldn't be too hard
     });

diff --git a/src/coreapps/ThemeEditor.tsx b/src/coreapps/ThemeEditor.tsx
@@ -1,4 +1,8 @@
 class ThemeEditor extends App {
+    name = "Theme Editor";
+    package = "anura.ui.themeeditor";
+    icon = "/assets/icons/theme.png";
+
     state = $state({
         resizing: false,
     });
@@ -153,9 +157,6 @@ class ThemeEditor extends App {
 
     constructor() {
         super();
-        this.name = "Theme Editor";
-        this.icon = "/assets/icons/theme.png";
-        this.package = "anura.ui.themeeditor";
     }
 
     page = async () => (

diff --git a/src/coreapps/XFrogApp.tsx b/src/coreapps/XFrogApp.tsx
@@ -1,17 +1,13 @@
 class XFrogApp extends App {
-    manifest: AppManifest;
-
-    activeWin: WMWindow;
-
+    name = "XFrog86";
+    package = "anura.xfrog";
+    icon = "/assets/icons/xfrog.png";
     hidden = true;
-
+    activeWin: WMWindow;
     xwindows: { [wid: string]: WMWindow } = {};
 
     constructor() {
         super();
-        this.name = "XFrog86";
-        this.package = "anura.xfrog";
-        this.icon = "/assets/icons/xfrog.png";
     }
 
     async startup() {

diff --git a/src/coreapps/x86MgrApp.tsx b/src/coreapps/x86MgrApp.tsx
@@ -6,6 +6,7 @@ class x86MgrApp extends App {
     constructor() {
         super();
     }
+
     async open(): Promise<WMWindow | undefined> {
         const win = anura.wm.create(this, {
             title: "x86",

diff --git a/v86 b/v86