Some more 1.4 fixes

Co-authored-by: Lap <ItsLap@users.noreply.github.com> Co-authored-by: Exeon <actuallyexeon@users.noreply.github.com>
Sakalt · Oct 26, 2023 · ea8c47c · ea8c47c
1 parent e9172cb
commit ea8c47c
Show file tree

Hide file tree

Showing 6 changed files with 33 additions and 15 deletions.
diff --git a/index.html b/index.html
@@ -25,6 +25,11 @@
   </head>
 
   <body>
+    <script
+      defer
+      type="text/javascript"
+      src="https://cdnjs.cloudflare.com/ajax/libs/jshashes/1.0.8/hashes.min.js"
+    ></script>
     <script
       defer
       src="https://cdnjs.cloudflare.com/ajax/libs/ace/1.22.0/ace.min.js"

diff --git a/pkgs/lib/FileDialog.js b/pkgs/lib/FileDialog.js
@@ -325,7 +325,7 @@ export default {
 
         let pathInput = new L.html("input")
           .class("fg")
-          .attr({ placeholder: "Path", value: "Root/" })
+          .attr({ placeholder: "Path", value: path + "/" || "Root/" })
           .on("keyup", async (e) => {
             let toBeSavedItem = e.target.value;
             if (!toBeSavedItem.startsWith("Root/")) e.target.value = "Root/";

diff --git a/pkgs/lib/FileMappings.js b/pkgs/lib/FileMappings.js
@@ -43,6 +43,12 @@ export default {
         opensWith: "apps:DevEnv",
         icon: "fileJson",
       },
+      js: {
+        type: "code",
+        label: "JavaScript file",
+        opensWith: "apps:DevEnv",
+        icon: "fileJson",
+      },
       png: {
         type: "image",
         label: "PNG image",

diff --git a/pkgs/lib/WindowSystem.js b/pkgs/lib/WindowSystem.js
@@ -140,6 +140,11 @@ export default {
         let thisWin = wrapper.elm.querySelector(".win-window");
         thisWin.style.position = "absolute";
 
+        if (this.options.width > screen.width) {
+          // this.maximize('top');
+          this.options.width = screen.width - (snapMargin*8);
+        }
+
         thisWin.id = this.options.id;
         thisWin.style.width = parseInt(this.options.width) + "px";
         thisWin.style.height = parseInt(this.options.height) + "px";

diff --git a/pkgs/ui/Modal.js b/pkgs/ui/Modal.js
@@ -113,12 +113,13 @@ export default {
       description,
       placeholder,
       parent = "body",
-      isPassword = false
+      isPassword = false,
+      value = ''
     ) {
       let wrapper = new lib.html("div").class("col");
       /* span */ new lib.html("span").text(description).appendTo(wrapper);
       let input = new lib.html("input")
-        .attr({ placeholder, type: isPassword === true ? "password" : "text" })
+        .attr({ placeholder, value, type: isPassword === true ? "password" : "text" })
         .appendTo(wrapper);
 
       return new Promise((res, _rej) => {

diff --git a/style.css b/style.css
@@ -21,7 +21,8 @@ a {
   cursor: default !important;
 }
 
-:root {
+:root,
+:root[data-theme="dark"] {
   color-scheme: dark;
   accent-color: var(--primary);
   --primary: hsl(222, 80%, 40%);
@@ -219,12 +220,12 @@ body {
 .desktop ~ .win-window.max {
   height: calc(100% - 42px - 12px) !important;
 }
-.win-window.max .win-titlebar,
-.win-window.max .win-content {
+.win-window.max > .win-titlebar,
+.win-window.max > .win-content {
   border-radius: 0;
 }
 
-.win-window.max .resize-grips {
+.win-window.max > .resize-grips {
   display: none;
 }
 
@@ -233,7 +234,7 @@ body {
   height: auto !important;
   border-radius: 5px;
 }
-.win-window.min .win-titlebar {
+.win-window.min > .win-titlebar {
   border-radius: 5px;
 }
 .win-window.min .win-content {
@@ -254,17 +255,17 @@ body {
   flex-shrink: 0;
 }
 
-.win-window:not(.focus) .win-titlebar .title,
-.win-window-decorative:not(.focus) .win-titlebar .title {
+.win-window:not(.focus) > .win-titlebar .title,
+.win-window-decorative:not(.focus) > .win-titlebar .title {
   opacity: 0.5;
 }
-.win-window:not(.focus) .win-titlebar button,
-.win-window-decorative:not(.focus) .win-titlebar button {
+.win-window:not(.focus) > .win-titlebar button,
+.win-window-decorative:not(.focus) > .win-titlebar button {
   filter: brightness(0.5);
 }
 
-.win-window.focus .win-titlebar,
-.win-window-decorative.focus .win-titlebar {
+.win-window.focus > .win-titlebar,
+.win-window-decorative.focus > .win-titlebar {
   background-color: var(--header);
 }
 
@@ -704,7 +705,7 @@ textarea {
   background-color: var(--neutral);
   border: 1px solid var(--outline);
   margin: 4px;
-  padding: 4px;
+  padding: 4px 6px;
   border-radius: 8px;
   outline: none;
   resize: none;