From 80e7d4d4f81791cbdf34682ee7c61daabb2c1668 Mon Sep 17 00:00:00 2001 From: LynithDev <61880709+LynithDev@users.noreply.github.com> Date: Tue, 22 Sep 2026 16:13:05 +0200 Subject: [PATCH] chore: update freya and enable debug overlay in release (#856) * chore: bump freya to 0.5.0-rc.6 * feat: add freya debug overlay plugin * chore: bump to rc.7 --- Cargo.lock | 98 +++++++++++-------- Cargo.toml | 6 +- .../src/components/text_input.rs | 4 +- packages/oneclient_app/src/main.rs | 2 + packages/oneclient_core/src/logger.rs | 1 + 5 files changed, 64 insertions(+), 47 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index dfda341d..2ad9310b 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -2192,19 +2192,20 @@ dependencies = [ [[package]] name = "freya" -version = "0.5.0-rc.4" -source = "git+https://github.com/marc2332/freya?branch=fix%2Fskip-basic-render-driver#56c6e694084210a8405a8cf9e50a1e236a64efd3" +version = "0.5.0-rc.7" +source = "git+https://github.com/marc2332/freya?tag=v0.5.0-rc.7#67f84cdc1d7492b171e397c1eaf4560274b397bf" dependencies = [ "cfg-if", "freya-android", "freya-animation", + "freya-borderless-plugin", "freya-clipboard", "freya-components", "freya-core", "freya-edit", "freya-engine", "freya-markdown", - "freya-performance-plugin", + "freya-metrics-plugin", "freya-query", "freya-radio", "freya-router", @@ -2216,8 +2217,8 @@ dependencies = [ [[package]] name = "freya-android" -version = "0.5.0-rc.4" -source = "git+https://github.com/marc2332/freya?branch=fix%2Fskip-basic-render-driver#56c6e694084210a8405a8cf9e50a1e236a64efd3" +version = "0.5.0-rc.7" +source = "git+https://github.com/marc2332/freya?tag=v0.5.0-rc.7#67f84cdc1d7492b171e397c1eaf4560274b397bf" dependencies = [ "freya-components", "freya-core", @@ -2229,17 +2230,28 @@ dependencies = [ [[package]] name = "freya-animation" -version = "0.5.0-rc.4" -source = "git+https://github.com/marc2332/freya?branch=fix%2Fskip-basic-render-driver#56c6e694084210a8405a8cf9e50a1e236a64efd3" +version = "0.5.0-rc.7" +source = "git+https://github.com/marc2332/freya?tag=v0.5.0-rc.7#67f84cdc1d7492b171e397c1eaf4560274b397bf" dependencies = [ "easer", "freya-core", ] +[[package]] +name = "freya-borderless-plugin" +version = "0.5.0-rc.7" +source = "git+https://github.com/marc2332/freya?tag=v0.5.0-rc.7#67f84cdc1d7492b171e397c1eaf4560274b397bf" +dependencies = [ + "freya-core", + "freya-engine", + "freya-winit", + "torin", +] + [[package]] name = "freya-clipboard" -version = "0.5.0-rc.4" -source = "git+https://github.com/marc2332/freya?branch=fix%2Fskip-basic-render-driver#56c6e694084210a8405a8cf9e50a1e236a64efd3" +version = "0.5.0-rc.7" +source = "git+https://github.com/marc2332/freya?tag=v0.5.0-rc.7#67f84cdc1d7492b171e397c1eaf4560274b397bf" dependencies = [ "copypasta", "freya-core", @@ -2247,8 +2259,8 @@ dependencies = [ [[package]] name = "freya-components" -version = "0.5.0-rc.4" -source = "git+https://github.com/marc2332/freya?branch=fix%2Fskip-basic-render-driver#56c6e694084210a8405a8cf9e50a1e236a64efd3" +version = "0.5.0-rc.7" +source = "git+https://github.com/marc2332/freya?tag=v0.5.0-rc.7#67f84cdc1d7492b171e397c1eaf4560274b397bf" dependencies = [ "accesskit", "anyhow", @@ -2273,8 +2285,8 @@ dependencies = [ [[package]] name = "freya-core" -version = "0.5.0-rc.4" -source = "git+https://github.com/marc2332/freya?branch=fix%2Fskip-basic-render-driver#56c6e694084210a8405a8cf9e50a1e236a64efd3" +version = "0.5.0-rc.7" +source = "git+https://github.com/marc2332/freya?tag=v0.5.0-rc.7#67f84cdc1d7492b171e397c1eaf4560274b397bf" dependencies = [ "accesskit", "async-io", @@ -2303,8 +2315,8 @@ dependencies = [ [[package]] name = "freya-edit" -version = "0.5.0-rc.4" -source = "git+https://github.com/marc2332/freya?branch=fix%2Fskip-basic-render-driver#56c6e694084210a8405a8cf9e50a1e236a64efd3" +version = "0.5.0-rc.7" +source = "git+https://github.com/marc2332/freya?tag=v0.5.0-rc.7#67f84cdc1d7492b171e397c1eaf4560274b397bf" dependencies = [ "bitflags 2.13.1", "freya-clipboard", @@ -2317,16 +2329,16 @@ dependencies = [ [[package]] name = "freya-engine" -version = "0.5.0-rc.4" -source = "git+https://github.com/marc2332/freya?branch=fix%2Fskip-basic-render-driver#56c6e694084210a8405a8cf9e50a1e236a64efd3" +version = "0.5.0-rc.7" +source = "git+https://github.com/marc2332/freya?tag=v0.5.0-rc.7#67f84cdc1d7492b171e397c1eaf4560274b397bf" dependencies = [ "freya-skia-safe", ] [[package]] name = "freya-markdown" -version = "0.5.0-rc.4" -source = "git+https://github.com/marc2332/freya?branch=fix%2Fskip-basic-render-driver#56c6e694084210a8405a8cf9e50a1e236a64efd3" +version = "0.5.0-rc.7" +source = "git+https://github.com/marc2332/freya?tag=v0.5.0-rc.7#67f84cdc1d7492b171e397c1eaf4560274b397bf" dependencies = [ "freya-components", "freya-core", @@ -2335,19 +2347,20 @@ dependencies = [ ] [[package]] -name = "freya-performance-plugin" -version = "0.5.0-rc.4" -source = "git+https://github.com/marc2332/freya?branch=fix%2Fskip-basic-render-driver#56c6e694084210a8405a8cf9e50a1e236a64efd3" +name = "freya-metrics-plugin" +version = "0.5.0-rc.7" +source = "git+https://github.com/marc2332/freya?tag=v0.5.0-rc.7#67f84cdc1d7492b171e397c1eaf4560274b397bf" dependencies = [ "freya-core", "freya-engine", "freya-winit", + "tracing", ] [[package]] name = "freya-query" -version = "0.5.0-rc.4" -source = "git+https://github.com/marc2332/freya?branch=fix%2Fskip-basic-render-driver#56c6e694084210a8405a8cf9e50a1e236a64efd3" +version = "0.5.0-rc.7" +source = "git+https://github.com/marc2332/freya?tag=v0.5.0-rc.7#67f84cdc1d7492b171e397c1eaf4560274b397bf" dependencies = [ "freya-core", "futures-util", @@ -2355,16 +2368,16 @@ dependencies = [ [[package]] name = "freya-radio" -version = "0.5.0-rc.4" -source = "git+https://github.com/marc2332/freya?branch=fix%2Fskip-basic-render-driver#56c6e694084210a8405a8cf9e50a1e236a64efd3" +version = "0.5.0-rc.7" +source = "git+https://github.com/marc2332/freya?tag=v0.5.0-rc.7#67f84cdc1d7492b171e397c1eaf4560274b397bf" dependencies = [ "freya-core", ] [[package]] name = "freya-router" -version = "0.5.0-rc.4" -source = "git+https://github.com/marc2332/freya?branch=fix%2Fskip-basic-render-driver#56c6e694084210a8405a8cf9e50a1e236a64efd3" +version = "0.5.0-rc.7" +source = "git+https://github.com/marc2332/freya?tag=v0.5.0-rc.7#67f84cdc1d7492b171e397c1eaf4560274b397bf" dependencies = [ "freya-core", "freya-router-macro", @@ -2375,8 +2388,8 @@ dependencies = [ [[package]] name = "freya-router-macro" -version = "0.5.0-rc.4" -source = "git+https://github.com/marc2332/freya?branch=fix%2Fskip-basic-render-driver#56c6e694084210a8405a8cf9e50a1e236a64efd3" +version = "0.5.0-rc.7" +source = "git+https://github.com/marc2332/freya?tag=v0.5.0-rc.7#67f84cdc1d7492b171e397c1eaf4560274b397bf" dependencies = [ "proc-macro2", "quote", @@ -2386,10 +2399,11 @@ dependencies = [ [[package]] name = "freya-sdk" -version = "0.5.0-rc.4" -source = "git+https://github.com/marc2332/freya?branch=fix%2Fskip-basic-render-driver#56c6e694084210a8405a8cf9e50a1e236a64efd3" +version = "0.5.0-rc.7" +source = "git+https://github.com/marc2332/freya?tag=v0.5.0-rc.7#67f84cdc1d7492b171e397c1eaf4560274b397bf" dependencies = [ "freya-core", + "tokio", ] [[package]] @@ -2435,8 +2449,8 @@ dependencies = [ [[package]] name = "freya-testing" -version = "0.5.0-rc.4" -source = "git+https://github.com/marc2332/freya?branch=fix%2Fskip-basic-render-driver#56c6e694084210a8405a8cf9e50a1e236a64efd3" +version = "0.5.0-rc.7" +source = "git+https://github.com/marc2332/freya?tag=v0.5.0-rc.7#67f84cdc1d7492b171e397c1eaf4560274b397bf" dependencies = [ "accesskit", "freya-clipboard", @@ -2450,8 +2464,8 @@ dependencies = [ [[package]] name = "freya-winit" -version = "0.5.0-rc.4" -source = "git+https://github.com/marc2332/freya?branch=fix%2Fskip-basic-render-driver#56c6e694084210a8405a8cf9e50a1e236a64efd3" +version = "0.5.0-rc.7" +source = "git+https://github.com/marc2332/freya?tag=v0.5.0-rc.7#67f84cdc1d7492b171e397c1eaf4560274b397bf" dependencies = [ "accesskit", "accesskit_winit", @@ -5338,8 +5352,8 @@ checksum = "35fb2e5f958ec131621fdd531e9fc186ed768cbe395337403ae56c17a74c68ec" [[package]] name = "pathgraph" -version = "0.5.0-rc.4" -source = "git+https://github.com/marc2332/freya?branch=fix%2Fskip-basic-render-driver#56c6e694084210a8405a8cf9e50a1e236a64efd3" +version = "0.5.0-rc.7" +source = "git+https://github.com/marc2332/freya?tag=v0.5.0-rc.7#67f84cdc1d7492b171e397c1eaf4560274b397bf" [[package]] name = "percent-encoding" @@ -5834,8 +5848,8 @@ checksum = "f8dcc9c7d52a811697d2151c701e0d08956f92b0e24136cf4cf27b57a6a0d9bf" [[package]] name = "ragnarok" -version = "0.5.0-rc.4" -source = "git+https://github.com/marc2332/freya?branch=fix%2Fskip-basic-render-driver#56c6e694084210a8405a8cf9e50a1e236a64efd3" +version = "0.5.0-rc.7" +source = "git+https://github.com/marc2332/freya?tag=v0.5.0-rc.7#67f84cdc1d7492b171e397c1eaf4560274b397bf" dependencies = [ "euclid", "hotpath", @@ -7718,8 +7732,8 @@ checksum = "7d56353a2a665ad0f41a421187180aab746c8c325620617ad883a99a1cbe66d2" [[package]] name = "torin" -version = "0.5.0-rc.4" -source = "git+https://github.com/marc2332/freya?branch=fix%2Fskip-basic-render-driver#56c6e694084210a8405a8cf9e50a1e236a64efd3" +version = "0.5.0-rc.7" +source = "git+https://github.com/marc2332/freya?tag=v0.5.0-rc.7#67f84cdc1d7492b171e397c1eaf4560274b397bf" dependencies = [ "euclid", "itertools 0.14.0", diff --git a/Cargo.toml b/Cargo.toml index 49a60566..6003be59 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -142,9 +142,9 @@ syn = {version = "=2.0.117"} thiserror = {version = "=2.0.18"} # ui -freya = {git = "https://github.com/marc2332/freya", branch = "fix/skip-basic-render-driver", features = ["engine", "winit", "router", "remote-asset", "sdk", "query", "radio", "titlebar", "tray"]} -freya-core = {git = "https://github.com/marc2332/freya", branch = "fix/skip-basic-render-driver"} -freya-testing = {git = "https://github.com/marc2332/freya", branch = "fix/skip-basic-render-driver"} +freya = {git = "https://github.com/marc2332/freya", tag = "v0.5.0-rc.7", features = ["engine", "winit", "router", "remote-asset", "sdk-tokio", "query", "radio", "borderless", "titlebar", "tray", "metrics"]} +freya-core = {git = "https://github.com/marc2332/freya", tag = "v0.5.0-rc.7"} +freya-testing = {git = "https://github.com/marc2332/freya", tag = "v0.5.0-rc.7"} freya-skia-safe = "=0.100.0" # required for the SKSL player renderer image = {version = "=0.25.10", default-features = false, features = ["png", "jpeg"]} diff --git a/packages/oneclient_app/src/components/text_input.rs b/packages/oneclient_app/src/components/text_input.rs index 86d822dc..52ad2340 100644 --- a/packages/oneclient_app/src/components/text_input.rs +++ b/packages/oneclient_app/src/components/text_input.rs @@ -12,7 +12,7 @@ const EXPANDED_HEIGHT: f32 = 180.; fn text_input(value: impl Into>) -> Input { Input::new(value) - .inner_margin(Gaps::new_symmetric(GAP_VERT, GAP_HORI)) + .padding(Gaps::new_symmetric(GAP_VERT, GAP_HORI)) .corner_radius(CornerRadius::new_all(8.)) .background(colors::component_bg()) .focus_background(colors::component_bg_pressed()) @@ -282,7 +282,7 @@ impl Component for TextInput { el = el.text_align(text_align); if text_align == TextAlign::Center { - el = el.inner_margin(Gaps::new_symmetric(GAP_VERT, 0.)); + el = el.padding(Gaps::new_symmetric(GAP_VERT, 0.)); } el diff --git a/packages/oneclient_app/src/main.rs b/packages/oneclient_app/src/main.rs index 19a9588e..6438fc92 100644 --- a/packages/oneclient_app/src/main.rs +++ b/packages/oneclient_app/src/main.rs @@ -228,6 +228,8 @@ fn main() { .and_then(|v| v.parse::().ok()) .unwrap_or(96 * 1024 * 1024), ) + .with_plugin(freya::borderless::BorderlessPlugin::new()) + .with_plugin(freya::metrics::MetricsPlugin::default()) .with_default_font(theme::DEFAULT_FONT); if show_tray_icon { diff --git a/packages/oneclient_core/src/logger.rs b/packages/oneclient_core/src/logger.rs index 66c5c50c..752ff407 100644 --- a/packages/oneclient_core/src/logger.rs +++ b/packages/oneclient_core/src/logger.rs @@ -69,6 +69,7 @@ const UI_FLOOD_TARGETS: &[&str] = &[ "freya_core::runner", "freya_core::tree", "freya_winit::renderer", + "freya::metrics", "ragnarok::executor", "ragnarok::nodes_state", "torin::torin",