oiupoyt/OneLauncher-Cracked
1
1
Fork 0
Code Issues Pull requests Projects Releases 2 Packages Wiki Activity

chore: log freya info and switched to experimental branch with windows rendering fix

Browse source
This commit is contained in:
LynithDev 2026-09-07 01:00:49 +02:00
parent f55f816342
commit 322c3d5420
7 changed files with 66 additions and 62 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

80
Cargo.lock generated
View file

@ -2094,8 +2094,7 @@ dependencies = [
[[package]]
name = "freya"
version = "0.5.0-rc.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "7a0902ffd592df176d3088ad001788f9a9438c21c40b4cbdec4dc3ef8bd16247"
source = "git+https://github.com/marc2332/freya?branch=fix%2Fskip-basic-render-driver#631db7cd14befdf6daf3b7c73e6e36117bffaf59"
dependencies = [
"cfg-if",
"freya-android",
@ -2118,8 +2117,7 @@ dependencies = [
[[package]]
name = "freya-android"
version = "0.5.0-rc.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "fe3befea9d845539f4428f232ec6b1661a54e974a6e7b852f82fef90d994ccba"
source = "git+https://github.com/marc2332/freya?branch=fix%2Fskip-basic-render-driver#631db7cd14befdf6daf3b7c73e6e36117bffaf59"
dependencies = [
"freya-components",
"freya-core",
@ -2132,10 +2130,8 @@ dependencies = [
[[package]]
name = "freya-animation"
version = "0.5.0-rc.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "d9f9429ff1e0a793068ebdd4be84c03e722fdfb3d20c8bf3a63a7a875ba0a6de"
source = "git+https://github.com/marc2332/freya?branch=fix%2Fskip-basic-render-driver#631db7cd14befdf6daf3b7c73e6e36117bffaf59"
dependencies = [
"async-io",
"easer",
"freya-core",
]
@ -2143,8 +2139,7 @@ dependencies = [
[[package]]
name = "freya-clipboard"
version = "0.5.0-rc.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "c8b2076b0a2d040ef2153cdd624dba28a6f4fabd64ca6182b128f642e2423b32"
source = "git+https://github.com/marc2332/freya?branch=fix%2Fskip-basic-render-driver#631db7cd14befdf6daf3b7c73e6e36117bffaf59"
dependencies = [
"copypasta",
"freya-core",
@ -2153,14 +2148,11 @@ dependencies = [
[[package]]
name = "freya-components"
version = "0.5.0-rc.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "bd20c885e7e29f43e0279affea98ae3e1392c9d9f07a09b0ce0fc65d46fc09dc"
source = "git+https://github.com/marc2332/freya?branch=fix%2Fskip-basic-render-driver#631db7cd14befdf6daf3b7c73e6e36117bffaf59"
dependencies = [
"accesskit",
"anyhow",
"async-io",
"async-lock",
"blocking",
"bytes 1.11.1",
"cfg-if",
"euclid",
@ -2170,22 +2162,24 @@ dependencies = [
"freya-engine",
"freya-router",
"freya-sdk",
"open",
"futures-channel",
"paste",
"reqwest 0.12.28",
"thiserror 2.0.18",
"torin",
"tracing",
"url",
]
[[package]]
name = "freya-core"
version = "0.5.0-rc.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "4ee644e4c5b4686b4cf59463347df7b64d9eb057c4a251e4528e90a1ecbf707d"
source = "git+https://github.com/marc2332/freya?branch=fix%2Fskip-basic-render-driver#631db7cd14befdf6daf3b7c73e6e36117bffaf59"
dependencies = [
"accesskit",
"async-io",
"bitflags 2.13.1",
"blocking",
"bytes 1.11.1",
"cursor-icon",
"freya-engine",
@ -2210,8 +2204,7 @@ dependencies = [
[[package]]
name = "freya-edit"
version = "0.5.0-rc.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "b0e20601f2d927591cace6bdaf731397908105a572eeaa934b387471bc6cd3b1"
source = "git+https://github.com/marc2332/freya?branch=fix%2Fskip-basic-render-driver#631db7cd14befdf6daf3b7c73e6e36117bffaf59"
dependencies = [
"bitflags 2.13.1",
"freya-clipboard",
@ -2225,8 +2218,7 @@ dependencies = [
[[package]]
name = "freya-engine"
version = "0.5.0-rc.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "95c5ba0dae520d78222758cffdcb335ba9cac6f846721b544fe216d894866b8c"
source = "git+https://github.com/marc2332/freya?branch=fix%2Fskip-basic-render-driver#631db7cd14befdf6daf3b7c73e6e36117bffaf59"
dependencies = [
"freya-skia-safe",
]
@ -2234,8 +2226,7 @@ dependencies = [
[[package]]
name = "freya-markdown"
version = "0.5.0-rc.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "94eb6ca3e8f9f18654ff14589c94155d7fa60c697dcbbbf0f02cb0a9e72e538c"
source = "git+https://github.com/marc2332/freya?branch=fix%2Fskip-basic-render-driver#631db7cd14befdf6daf3b7c73e6e36117bffaf59"
dependencies = [
"freya-components",
"freya-core",
@ -2246,8 +2237,7 @@ dependencies = [
[[package]]
name = "freya-performance-plugin"
version = "0.5.0-rc.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "e2c69c000dd001e2df79a8b9ad0977cc0f835c494d2e17a2848b80495c293fce"
source = "git+https://github.com/marc2332/freya?branch=fix%2Fskip-basic-render-driver#631db7cd14befdf6daf3b7c73e6e36117bffaf59"
dependencies = [
"freya-core",
"freya-engine",
@ -2257,10 +2247,8 @@ dependencies = [
[[package]]
name = "freya-query"
version = "0.5.0-rc.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "9db86c4a0dea3ce04df0defa4ce62dad8e7c32bad05090e3644ff6d2f2e0655e"
source = "git+https://github.com/marc2332/freya?branch=fix%2Fskip-basic-render-driver#631db7cd14befdf6daf3b7c73e6e36117bffaf59"
dependencies = [
"async-io",
"freya-core",
"futures-util",
]
@ -2268,8 +2256,7 @@ dependencies = [
[[package]]
name = "freya-radio"
version = "0.5.0-rc.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "35a2458e07d312a2365951a216a8fa14a604159f8ae7702a7ccb2ffbc3fccf0a"
source = "git+https://github.com/marc2332/freya?branch=fix%2Fskip-basic-render-driver#631db7cd14befdf6daf3b7c73e6e36117bffaf59"
dependencies = [
"freya-core",
]
@ -2277,8 +2264,7 @@ dependencies = [
[[package]]
name = "freya-router"
version = "0.5.0-rc.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "f26a8c7b3b3c6432de8d90c01821f5206ab6d6c2c8417fe7b873d7a6586e7580"
source = "git+https://github.com/marc2332/freya?branch=fix%2Fskip-basic-render-driver#631db7cd14befdf6daf3b7c73e6e36117bffaf59"
dependencies = [
"freya-core",
"freya-router-macro",
@ -2290,8 +2276,7 @@ dependencies = [
[[package]]
name = "freya-router-macro"
version = "0.5.0-rc.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "105a54bccebe377d4ce12066813737a0f86e1cc587cdc98c4df92fe48c800be4"
source = "git+https://github.com/marc2332/freya?branch=fix%2Fskip-basic-render-driver#631db7cd14befdf6daf3b7c73e6e36117bffaf59"
dependencies = [
"proc-macro2",
"quote",
@ -2302,18 +2287,16 @@ dependencies = [
[[package]]
name = "freya-sdk"
version = "0.5.0-rc.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "0fe2c1e80db9c6c782536bf1e8f8e4859ed43359e7c0775c619be8826e16dd18"
source = "git+https://github.com/marc2332/freya?branch=fix%2Fskip-basic-render-driver#631db7cd14befdf6daf3b7c73e6e36117bffaf59"
dependencies = [
"async-io",
"freya-core",
]
[[package]]
name = "freya-skia-bindings"
version = "0.99.1"
version = "0.100.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "6e65f9ff56a7d08451c839386a86842f065552c561041d0cdcc213390a2361a2"
checksum = "2a59be930a7bfe544a7f16fcc6d7326dfabff3ffe65c3321932f4e61234f4941"
dependencies = [
"bindgen",
"cc",
@ -2328,9 +2311,9 @@ dependencies = [
[[package]]
name = "freya-skia-safe"
version = "0.99.1"
version = "0.100.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "567c808eff01a4ad7d9d3dc42ce0fb4335dce76a2398d0cd18f1357bf2450c81"
checksum = "7975576c62caa0b8bccb6f4cfd16c61f57b27fffa15540f37deba9bd246bf009"
dependencies = [
"base64 0.23.1",
"bitflags 2.13.1",
@ -2353,8 +2336,7 @@ dependencies = [
[[package]]
name = "freya-testing"
version = "0.5.0-rc.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "fa3e16eb0522ce2db64df537943329af02978d142f51a75786a02a0cee8f2a10"
source = "git+https://github.com/marc2332/freya?branch=fix%2Fskip-basic-render-driver#631db7cd14befdf6daf3b7c73e6e36117bffaf59"
dependencies = [
"accesskit",
"freya-clipboard",
@ -2369,8 +2351,7 @@ dependencies = [
[[package]]
name = "freya-winit"
version = "0.5.0-rc.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "5f3e4172e15aa5bd524db527733fec0ba9ac3e4191388064c9ff0d4f5a23e091"
source = "git+https://github.com/marc2332/freya?branch=fix%2Fskip-basic-render-driver#631db7cd14befdf6daf3b7c73e6e36117bffaf59"
dependencies = [
"accesskit",
"accesskit_winit",
@ -2396,6 +2377,7 @@ dependencies = [
"objc2-core-foundation",
"objc2-metal 0.3.2",
"objc2-quartz-core 0.3.2",
"open",
"ragnarok",
"raw-window-handle",
"rfd",
@ -2403,6 +2385,7 @@ dependencies = [
"softbuffer",
"torin",
"tracing",
"windows-sys 0.60.2",
"winit",
]
@ -4923,8 +4906,7 @@ checksum = "35fb2e5f958ec131621fdd531e9fc186ed768cbe395337403ae56c17a74c68ec"
[[package]]
name = "pathgraph"
version = "0.5.0-rc.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "e2f33d657119e71a8b28da5c8d52ade41672d873c292ae5bf4833b8fa658c86a"
source = "git+https://github.com/marc2332/freya?branch=fix%2Fskip-basic-render-driver#631db7cd14befdf6daf3b7c73e6e36117bffaf59"
[[package]]
name = "percent-encoding"
@ -5351,8 +5333,7 @@ checksum = "f8dcc9c7d52a811697d2151c701e0d08956f92b0e24136cf4cf27b57a6a0d9bf"
[[package]]
name = "ragnarok"
version = "0.5.0-rc.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "5c5bbbde00035bdece3362a320eb982f23a57f82bf5f480a74f6aec4aaa01203"
source = "git+https://github.com/marc2332/freya?branch=fix%2Fskip-basic-render-driver#631db7cd14befdf6daf3b7c73e6e36117bffaf59"
dependencies = [
"euclid",
"hotpath",
@ -7153,8 +7134,7 @@ checksum = "7d56353a2a665ad0f41a421187180aab746c8c325620617ad883a99a1cbe66d2"
[[package]]
name = "torin"
version = "0.5.0-rc.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "e4fb54c965056694c8616b9e0a6dfa151207c3599cd0c18f93acdb7172949bee"
source = "git+https://github.com/marc2332/freya?branch=fix%2Fskip-basic-render-driver#631db7cd14befdf6daf3b7c73e6e36117bffaf59"
dependencies = [
"euclid",
"itertools 0.14.0",

8
Cargo.toml
View file

@ -139,10 +139,10 @@ syn = {version = "=2.0.117"}
thiserror = {version = "=2.0.18"}
# ui
freya = {version = "=0.5.0-rc.4", features = ["engine", "winit", "router", "remote-asset", "sdk", "query", "radio", "titlebar"]}
freya-core = {version = "=0.5.0-rc.4"}
freya-testing = {version = "=0.5.0-rc.4"}
freya-skia-safe = "=0.99.1" # required for the SKSL player renderer
freya = {git = "https://github.com/marc2332/freya", branch = "fix/skip-basic-render-driver", features = ["engine", "winit", "router", "remote-asset", "sdk", "query", "radio", "titlebar"]}
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-skia-safe = "=0.100.0" # required for the SKSL player renderer
image = {version = "=0.25.10", default-features = false, features = ["png", "jpeg"]}
[profile.release]

6
packages/oneclient_app/src/components/navbar/mod.rs
View file

@ -18,20 +18,20 @@ pub(super) fn navbar_button() -> Button {
pub fn window_controls() -> impl IntoElement {
let minimize = |_| {
Platform::get().with_window(None, |win| {
Platform::get().with_window(Platform::window_id(), |win| {
win.set_minimized(true);
});
};
let maximize = |_| {
Platform::get().with_window(None, |win| {
Platform::get().with_window(Platform::window_id(), |win| {
win.set_maximized(!win.is_maximized());
});
};
let close = |_| {
let platform = Platform::get();
Platform::get().with_window(None, move |window| {
Platform::get().with_window(Platform::window_id(), move |window| {
platform.close_window(window.id());
});
};

2
packages/oneclient_app/src/platform.rs
View file

@ -3,7 +3,7 @@ const ALLOWED_URL_SCHEMES: [&str; 3] = ["http", "https", "mailto"];
pub fn focus_window() {
use freya::prelude::{Platform, WinitPlatformExt};
Platform::get().with_window(None, |win| {
Platform::get().with_window(Platform::window_id(), |win| {
win.set_minimized(false);
win.focus_window();
});

2
packages/oneclient_app/src/view/console.rs
View file

@ -34,7 +34,7 @@ pub fn open_log_console() {
let mut state = CONSOLE_WINDOW.lock().expect("console window state");
match *state {
ConsoleWindow::Open(id) => {
Platform::get().focus_window(Some(id));
Platform::get().focus_window(id);
return;
}
ConsoleWindow::Opening => return,

2
packages/oneclient_app/src/view/relocating.rs
View file

@ -110,7 +110,7 @@ fn moved(outcome: &RelocationOutcome, actions: Actions) -> Element {
.primary()
.on_press(|_| {
let platform = Platform::get();
Platform::get().with_window(None, move |window| {
Platform::get().with_window(Platform::window_id(), move |window| {
platform.close_window(window.id());
});
})

28
packages/oneclient_core/src/logger.rs
View file

@ -34,8 +34,6 @@ const APP_TARGETS: &[&str] = &[
/// to `info` and that would otherwise let this lot flood the log
const NOISY_TARGETS: &[&str] = &[
"calloop",
"freya_core",
"freya_winit",
"h2",
"hickory_proto",
"hickory_resolver",
@ -56,6 +54,26 @@ const NOISY_TARGETS: &[&str] = &[
"zbus",
];
const UI_TARGETS: &[&str] = &[
"freya",
"freya_components",
"freya_core",
"freya_radio",
"freya_winit",
"ragnarok",
"torin",
];
const UI_FLOOD_TARGETS: &[&str] = &[
"freya_core::accessibility",
"freya_core::runner",
"freya_core::tree",
"freya_winit::renderer",
"ragnarok::executor",
"ragnarok::nodes_state",
"torin::torin",
];
/// Whether `target` belongs to one of [`APP_TARGETS`] rather than a dependency
fn is_app_target(target: &str) -> bool {
APP_TARGETS.iter().any(|app| {
@ -101,6 +119,12 @@ fn directives(app_level: &str, base_level: &str) -> String {
for target in NOISY_TARGETS {
out.push_str(&format!(",{target}=warn"));
}
for target in UI_TARGETS {
out.push_str(&format!(",{target}=info"));
}
for target in UI_FLOOD_TARGETS {
out.push_str(&format!(",{target}=warn"));
}
for target in APP_TARGETS {
out.push_str(&format!(",{target}={app_level}"));
}