fix re-layout on session load

tiagolr · Dec 21, 2024 · bfb1280 · bfb1280
1 parent c0349cc
commit bfb1280
Show file tree

Hide file tree

Showing 11 changed files with 67 additions and 57 deletions.
diff --git a/docs/assets/index-CLFkdzB_.css → docs/assets/index-BXVyj4tC.css b/docs/assets/index-CLFkdzB_.css → docs/assets/index-BXVyj4tC.css
diff --git a/docs/assets/index-D1R_QktQ.js → docs/assets/index-C1c2PsZC.js b/docs/assets/index-D1R_QktQ.js → docs/assets/index-C1c2PsZC.js
diff --git a/docs/index.html b/docs/index.html
@@ -1,15 +1,15 @@
-<!doctype html>
-<html lang="en">
-  <head>
-    <meta charset="UTF-8" />
-    <link rel="icon" type="image/svg+xml" href="/logo.svg" />
-    <meta name="viewport" content="width=device-width, initial-scale=1.0" />
-    <meta name="description" content="MIDI router with scripting and a node based interface">
-    <title>Mididash</title>
-    <script type="module" crossorigin src="/assets/index-D1R_QktQ.js"></script>
-    <link rel="stylesheet" crossorigin href="/assets/index-CLFkdzB_.css">
-  </head>
-  <body>
-    <div id="app"></div>
-  </body>
-</html>
+<!doctype html>
+<html lang="en">
+  <head>
+    <meta charset="UTF-8" />
+    <link rel="icon" type="image/svg+xml" href="/logo.svg" />
+    <meta name="viewport" content="width=device-width, initial-scale=1.0" />
+    <meta name="description" content="MIDI router with Lua scripting and a node based interface">
+    <title>Mididash</title>
+    <script type="module" crossorigin src="/assets/index-C1c2PsZC.js"></script>
+    <link rel="stylesheet" crossorigin href="/assets/index-BXVyj4tC.css">
+  </head>
+  <body>
+    <div id="app"></div>
+  </body>
+</html>
diff --git a/site/index.html b/site/index.html
@@ -4,7 +4,7 @@
     <meta charset="UTF-8" />
     <link rel="icon" type="image/svg+xml" href="/logo.svg" />
     <meta name="viewport" content="width=device-width, initial-scale=1.0" />
-    <meta name="description" content="MIDI router with scripting and a node based interface">
+    <meta name="description" content="MIDI router with Lua scripting and a node based interface">
     <title>Mididash</title>
   </head>
   <body>

diff --git a/src-tauri/Cargo.lock b/src-tauri/Cargo.lock
diff --git a/src-tauri/Cargo.toml b/src-tauri/Cargo.toml
@@ -1,9 +1,14 @@
 [package]
-name = "mididash"
-version = "0.1.7"
-description = "A new midi router"
+name = "Mididash"
+version = "0.1.8"
+description = "Midi router with Lua scripting and a node based interface"
 authors = ["tilr"]
 edition = "2021"
+readme = "../README.md"
+homepage = "mididash.com"
+repository = "https://github.com/tiagolr/mididash"
+license = "../LICENSE"
+keywords = ["audio", "cross-platform", "router", "midi", "midi-events", "tauri", "audio-midi", "midi-router"]
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 

diff --git a/src-tauri/tauri.conf.json b/src-tauri/tauri.conf.json
@@ -1,7 +1,7 @@
 {
   "$schema": "https://schema.tauri.app/config/2",
   "productName": "Mididash",
-  "version": "0.1.7",
+  "version": "0.1.8",
   "identifier": "com.mididash.app",
   "build": {
     "beforeDevCommand": "npm run dev",

diff --git a/src/components/Navbar.vue b/src/components/Navbar.vue
@@ -102,6 +102,7 @@ export default {
       </div>
       <div
         class="nav-button"
+        :style="$store.app.settings.hubPaused && 'background: #f008'"
         :title="$store.app.settings.hubPaused ? 'Start MIDI processing' : 'Pause MIDI processing'"
         @click="$store.app.toggleHubPaused"
       >

diff --git a/src/components/graph/GraphView.vue b/src/components/graph/GraphView.vue
@@ -109,7 +109,7 @@ export default {
     },
     async onProjectNew () {
       await this.$nextTick()
-      if (!this.$store.app.settings.projectPath) { // if its a new project not an opened one
+      if (!this.$store.app.preferences.lastSave) { // if its a new project not an opened one
         this.$store.graph.layoutNodes()
       }
       this.zoomNodes()
@@ -234,7 +234,7 @@ export default {
         const pan = this.$refs.screen.getPan()
         const x = (event.clientX - rect.left - pan.x) / zoom
         const y = (event.clientY - rect.top - pan.y) / zoom
-        this.$store.graph.createDeviceAt(x, y, device)
+        this.$store.graph.createDeviceAt(x, y, true, device)
       }
     },
 

diff --git a/src/stores/app.js b/src/stores/app.js
@@ -161,7 +161,7 @@ export default defineStore('app', {
       try {
         await this.getSettings() // make sure settings are up to date
         const project = await invoke('get_project').then(camelCase)
-        this.preferences = project.preferences
+        this.preferences = camelCase(project.preferences) || {}
 
         project.devices.forEach(device => {
           if (typeof device.name === 'string') {
@@ -225,6 +225,7 @@ export default defineStore('app', {
      * Saves current session to config file
      */
     async saveCurrentProject() {
+      this.preferences.lastSave = (new Date()).toISOString()
       await invoke('save_current_project', { project: snakeCase({
         version: this.version,
         preferences: this.preferences,

diff --git a/src/stores/graph.js b/src/stores/graph.js
@@ -139,7 +139,7 @@ export default defineStore('graph', {
       this.fitNode(id)
     },
 
-    async createDeviceAt(x, y, opts = { class: 'Unknown' }) {
+    async createDeviceAt(x, y, centerDevice, opts = { class: 'Unknown' }) {
       const makeUniqueId = classname => {
         const nodes = this.nodes.filter(n => n.class === classname)
         let i = nodes.length + 1
@@ -165,11 +165,13 @@ export default defineStore('graph', {
         device = this.addNewDevice(device)
 
         // center new device on mouse position
-        setTimeout(() => {
-          device = this.nodes.at(-1)
-          device.x -= device.width / 2
-          device.y -= 16
-        }, 0);
+        if (centerDevice) {
+          setTimeout(() => {
+            device = this.nodes.at(-1)
+            device.x -= device.width / 2
+            device.y -= 16
+          }, 0);
+        }
 
         // this needs to go some place better
         if (opts.class === 'trigger') {
@@ -187,6 +189,7 @@ export default defineStore('graph', {
           device.minimized = true
         }
 
+        // probably the same
         if (opts.class === 'script') {
           device.outPorts = opts.outPorts.map(id => ({ id, name: id }))
           device.name = opts.name // template name
@@ -211,7 +214,7 @@ export default defineStore('graph', {
       const outputs = this.edges.filter(e => e.to === device.id)
       try {
         await this.removeDevice(device.id) // remove old device
-        const newdevice = await this.createDeviceAt(device.x, device.y, { id, class: device.class }) // create new device
+        const newdevice = await this.createDeviceAt(device.x, device.y, false, { id, class: device.class }) // create new device
         this.setDeviceName(newdevice.id, newname)
         for (let input of inputs) { // reconnect new device
           input.from = newdevice.id