Merge github.com:jhonleeee/playground-macos

shisama · May 9, 2021 · 33c66d8 · 33c66d8
2 parents 8857d9f + 31e3b6e
commit 33c66d8
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 8 deletions.
diff --git a/src/components/Window.js b/src/components/Window.js
@@ -39,6 +39,9 @@ const ExitFullIcon = ({ size }) => {
   );
 };
 
+const minMarginY = 24;
+const minMarginX = 100;
+
 const TrafficLights = ({ id, close, max, setMax, setMin }) => {
   const closeWindow = (e) => {
     e.stopPropagation();
@@ -132,8 +135,18 @@ export default class Window extends Component {
           height: height
         }}
         position={{
-          x: this.props.max ? 0 : this.state.x,
-          y: this.props.max ? 0 : this.state.y
+          x: this.props.max
+            ? 0
+            : Math.min(
+                window.innerWidth - minMarginX,
+                Math.max(-this.state.width + minMarginX, this.state.x)
+              ),
+          y: this.props.max
+            ? 0
+            : Math.min(
+                window.innerHeight - minMarginY,
+                Math.max(minMarginY, this.state.y)
+              )
         }}
         onDragStop={(e, d) => {
           this.setState({ x: d.x, y: d.y });

diff --git a/src/components/apps/Terminal.js b/src/components/apps/Terminal.js
@@ -290,7 +290,7 @@ export default class Terminal extends Component {
       const cmd = input[0];
       const args = input[1];
 
-      // we can"t edit the past input
+      // we can't edit the past input
       $input.setAttribute("readonly", true);
 
       if (input_text.substr(0, 6) === "rm -rf") this.setState({ rmrf: true });

diff --git a/src/components/dock/Dock.js b/src/components/dock/Dock.js
@@ -22,7 +22,7 @@ export default function Dock({
 
   return (
     <div
-      className="dock w-full fixed bottom-0 overflow-x-scroll sm:overflow-x-visible"
+      className="dock w-full sm:w-max fixed left-0 right-0 mx-auto bottom-0 overflow-x-scroll sm:overflow-x-visible"
       style={{
         zIndex: hide ? 0 : 99999
       }}

diff --git a/src/components/menus/TopBar.js b/src/components/menus/TopBar.js
@@ -134,10 +134,6 @@ class TopBar extends Component {
     this.props.sleepMac(e);
   };
 
-  test = () => {
-    console.log("hi");
-  };
-
   render() {
     return (
       <div className="nightwind-prevent w-full h-6 px-4 fixed top-0 flex flex-row justify-between items-center text-sm text-white bg-gray-500 bg-opacity-10 blur shadow transition">