Merge branch 'master' into winit-0.31

Author: PolyMeilex

Cargo.lock

@@ -1,15 +1,5 @@
 [source.crates-io]
 replace-with = "vendored-sources"
 
-[source."git+https://github.com/iced-rs/cryoglyph.git?rev=be2defe4a13fd7c97c6f4c81e8e085463eb578dc"]
-git = "https://github.com/iced-rs/cryoglyph.git"
-rev = "be2defe4a13fd7c97c6f4c81e8e085463eb578dc"
-replace-with = "vendored-sources"
-
-[source."git+https://github.com/iced-rs/iced.git?rev=892ac1ce722a809e73aecd8d47ed4e7254d156df"]
-git = "https://github.com/iced-rs/iced.git"
-rev = "892ac1ce722a809e73aecd8d47ed4e7254d156df"
-replace-with = "vendored-sources"
-
 [source.vendored-sources]
 directory = "vendor"

flatpak/cargo-config.toml

@@ -1,7 +1,7 @@
 {
   "app-id": "com.github.polymeilex.neothesia",
   "runtime": "org.freedesktop.Platform",
-  "runtime-version": "24.08",
+  "runtime-version": "25.08",
   "sdk": "org.freedesktop.Sdk",
   "sdk-extensions": ["org.freedesktop.Sdk.Extension.rust-stable"],
   "command": "neothesia",
@@ -37,13 +37,13 @@
         {
           "type": "git",
           "url": "https://github.com/PolyMeilex/Neothesia.git",
-          "tag": "v0.3.0",
+          "tag": "v0.4.0",
           "commit": "..."
         },
         {
           "type": "archive",
-          "url": "https://github.com/flathub/com.github.polymeilex.neothesia/releases/download/0.2.0-vendor/vendor.tar.xz",
-          "sha256": "bdb3ed37cf2174f7122a6d10d87fac4f5eef649264f7beda0e6a88288f7f6ffb",
+          "url": "https://github.com/flathub/com.github.polymeilex.neothesia/releases/download/0.4.0-vendor/vendor.tar.xz",
+          "sha256": "...",
           "dest": "vendor"
         }
       ]

flatpak/com.github.polymeilex.neothesia.json

@@ -7,6 +7,9 @@
   <project_license>GPL-3.0-only</project_license>
 
   <releases>
+    <release version="0.4.0" date="2026-31-01" timestamp="1769877506">
+      <url>https://github.com/PolyMeilex/Neothesia/releases/tag/v0.4.0</url>
+    </release>
     <release version="0.3.0" date="2025-23-05" timestamp="1747954829">
       <url>https://github.com/PolyMeilex/Neothesia/releases/tag/v0.3.0</url>
     </release>

flatpak/com.github.polymeilex.neothesia.metainfo.xml

@@ -5,3 +5,4 @@ edition.workspace = true
 
 [dependencies]
 midir.workspace = true
+log.workspace = true

midi-io/Cargo.toml

@@ -100,6 +100,7 @@ impl MidiInputManager {
                     },
                     (),
                 )
+                .inspect_err(|err| log::error!("MIDI-in connection fail: {err}"))
                 .ok()
         })
         .map(MidiInputConnection)

midi-io/src/lib.rs

@@ -96,6 +96,13 @@ impl KeyboardRenderer {
     fn rebuild_quad_cache(&mut self) {
         let instances = &mut self.cache;
 
+        instances.push(QuadInstance {
+            position: [self.pos.x, self.pos.y - 4.0],
+            size: [self.layout.width, 4.0],
+            color: [0.25, 0.02, 0.02, 1.0],
+            ..Default::default()
+        });
+
         // black_background
         instances.push(QuadInstance {
             position: self.pos.into(),

neothesia-core/src/render/keyboard/mod.rs

@@ -57,22 +57,13 @@ fn vs_main(vertex: Vertex, quad: QuadInstance) -> VertexOutput {
     return out;
 }
 
-// SFD code is licenced under: MIT by Héctor Ramón & Iced contributors
-fn distance_alg(
-    frag_coord: vec2<f32>,
-    position: vec2<f32>,
-    size: vec2<f32>,
-    radius: f32
-) -> f32 {
-    var inner_half_size: vec2<f32> = (size - vec2<f32>(radius, radius) * 2.0) / 2.0;
-    var top_left: vec2<f32> = position + vec2<f32>(radius, radius);
-    return rounded_box_sdf(frag_coord - top_left - inner_half_size, inner_half_size, 0.0);
-}
-
-// Given a vector from a point to the center of a rounded rectangle of the given `size` and
-// border `radius`, determines the point's distance from the nearest edge of the rounded rectangle
+// Point's distance from the nearest edge of the rounded rectangle
+//
+// https://www.shadertoy.com/view/Nlc3zf
 fn rounded_box_sdf(to_center: vec2<f32>, size: vec2<f32>, radius: f32) -> f32 {
-    return length(max(abs(to_center) - size + vec2<f32>(radius, radius), vec2<f32>(0.0, 0.0))) - radius;
+    let half_size = size * 0.5;
+    let q = abs(to_center) - half_size + vec2(radius, radius);
+    return length(max(q, vec2(0.0))) + min(max(q.x, q.y), 0.0) - radius;
 }
 
 // Based on the fragment position and the center of the quad, select one of the 4 radii.
@@ -89,24 +80,17 @@ fn select_border_radius(radii: vec4<f32>, position: vec2<f32>, center: vec2<f32>
 
 @fragment
 fn fs_main(in: VertexOutput) -> @location(0) vec4<f32> {
-    var border_radius = select_border_radius(
+    let center = in.quad_position + in.quad_size * 0.5;
+    
+    let border_radius = select_border_radius(
         in.quad_border_radius,
         in.position.xy,
-        (in.quad_position + (in.quad_size * 0.5)).xy
+        center
     );
 
-    var dist: f32 = distance_alg(
-        vec2<f32>(in.position.x, in.position.y),
-        in.quad_position,
-        in.quad_size,
-        border_radius
-    );
-
-    var alpha: f32 = 1.0 - smoothstep(
-        max(border_radius - 0.5, 0.0),
-        border_radius + 0.5,
-        dist
-    );
+    let local_center = in.position.xy - center;
+    let dist = rounded_box_sdf(local_center, in.quad_size, border_radius);
+    let alpha = 1.0 - smoothstep(-0.5, 0.5, dist);
 
     return vec4(in.quad_color.xyz, in.quad_color.w * alpha);
 }

neothesia-core/src/render/quad/shader.wgsl

@@ -1,6 +1,6 @@
 [package]
 name = "neothesia"
-version = "0.3.0"
+version = "0.4.0"
 authors = ["Poly <marynczak.bartlomiej@gmail.com>"]
 edition.workspace = true
 default-run = "neothesia"

neothesia/Cargo.toml

@@ -1,3 +1,5 @@
+#![allow(unused)]
+
 pub fn cone_icon() -> &'static str {
     "\u{F2D2}"
 }
@@ -34,7 +36,6 @@ pub fn plus_icon() -> &'static str {
     "\u{F4FE}"
 }
 
-#[allow(unused)]
 pub fn balloon_icon() -> &'static str {
     "\u{f709}"
 }