diff --git a/Cargo.lock b/Cargo.lock index d75c50a9..8d98cab0 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -356,7 +356,7 @@ dependencies = [ [[package]] name = "article-core" version = "0.1.0" -source = "git+https://github.com/hagency-org/Rinx.git?rev=82391adf228692222462fc8696a04906a7aaf3eb#82391adf228692222462fc8696a04906a7aaf3eb" +source = "git+https://github.com/hagency-org/Rinx.git?rev=5cf70a822aadb0da626123affa67c814f6848b58#5cf70a822aadb0da626123affa67c814f6848b58" dependencies = [ "blake3", "image", @@ -373,7 +373,7 @@ dependencies = [ [[package]] name = "article-makepad" version = "0.1.0" -source = "git+https://github.com/hagency-org/Rinx.git?rev=82391adf228692222462fc8696a04906a7aaf3eb#82391adf228692222462fc8696a04906a7aaf3eb" +source = "git+https://github.com/hagency-org/Rinx.git?rev=5cf70a822aadb0da626123affa67c814f6848b58#5cf70a822aadb0da626123affa67c814f6848b58" dependencies = [ "article-core", "libc", @@ -8437,7 +8437,7 @@ dependencies = [ [[package]] name = "rinx" version = "1.0.0-beta.1" -source = "git+https://github.com/hagency-org/Rinx.git?rev=82391adf228692222462fc8696a04906a7aaf3eb#82391adf228692222462fc8696a04906a7aaf3eb" +source = "git+https://github.com/hagency-org/Rinx.git?rev=5cf70a822aadb0da626123affa67c814f6848b58#5cf70a822aadb0da626123affa67c814f6848b58" dependencies = [ "anyhow", "arboard", @@ -8509,7 +8509,7 @@ dependencies = [ [[package]] name = "rinx-miniapp-core" version = "0.1.0" -source = "git+https://github.com/hagency-org/Rinx.git?rev=82391adf228692222462fc8696a04906a7aaf3eb#82391adf228692222462fc8696a04906a7aaf3eb" +source = "git+https://github.com/hagency-org/Rinx.git?rev=5cf70a822aadb0da626123affa67c814f6848b58#5cf70a822aadb0da626123affa67c814f6848b58" dependencies = [ "serde", "serde_json", diff --git a/Cargo.toml b/Cargo.toml index bbeb645e..e8eb3f9e 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -93,7 +93,7 @@ octosense-app-peers = { path = "../OctoSense-System-Apps/crates/app-peers", feat # module, built without its standalone entry point or local kernel. Its # assistant is the shell's, injected at creation: no kernel, no credentials, # no AppCard. -rinx = { git = "https://github.com/hagency-org/Rinx.git", rev = "82391adf228692222462fc8696a04906a7aaf3eb", default-features = false, features = ["octosense-module"], optional = true } +rinx = { git = "https://github.com/hagency-org/Rinx.git", rev = "5cf70a822aadb0da626123affa67c814f6848b58", default-features = false, features = ["octosense-module"], optional = true } # The assistant as a module, seated in the pane in-process: the web build's # only chat, a desktop option. Without the engine feature: no model runtime, # NoModel and the tool console (the child process keeps the real models). diff --git a/src/main.rs b/src/main.rs index ce6d5529..4fb3a135 100644 --- a/src/main.rs +++ b/src/main.rs @@ -4413,6 +4413,10 @@ impl AppMain for App { } } self.phone_animation_event(cx,event); + if self.state.as_ref().is_some_and(|state| state.style.target.mobile()) && event.back_pressed() { + self.phone_action(cx, mobile::PhoneHit::Back); + return; + } if let Some(ne) = self.style_frame.is_event(event) { if self.state.is_some() { let dt=if self.style_time==0.0 {0.0}else{(ne.time-self.style_time).min(0.05)}; diff --git a/src/mobile_app.rs b/src/mobile_app.rs index b01793ab..8a3f8bc3 100644 --- a/src/mobile_app.rs +++ b/src/mobile_app.rs @@ -340,7 +340,7 @@ impl App { self.state_mut().phone.keyboard_target=0.0; self.animate_phone(cx); } - fn phone_action(&mut self,cx:&mut Cx,hit:PhoneHit) { + pub(super) fn phone_action(&mut self,cx:&mut Cx,hit:PhoneHit) { match hit { PhoneHit::App(app)=>{ // A running window of the app, a home tile's own client