tyiu/notedeck
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

android: fix back button

Browse Source 
Fixes: https://github.com/damus-io/notedeck/issues/972
Signed-off-by: William Casarin <jb55@jb55.com>
This commit is contained in:
William Casarin
2025-07-17 09:18:20 -07:00
parent db6f02084d
commit c0c2120f74
3 changed files with 24 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
Cargo.lock generated
View File

@@ -1375,17 +1375,17 @@ checksum = "d8b14ccef22fc6f5a8f4d7d768562a182c04ce9a3b3157b91390b52ddfdf1a76"
[[package]] [[package]]
name = "ecolor" name = "ecolor"
version = "0.31.1" version = "0.31.1"
source = "git+https://github.com/damus-io/egui?rev=77eb8af1774367c0d4743f1d849a139ff4689614#77eb8af1774367c0d4743f1d849a139ff4689614" source = "git+https://github.com/damus-io/egui?rev=041d4d18b16cf8be97e0d7ef5892c87436352dfc#041d4d18b16cf8be97e0d7ef5892c87436352dfc"
dependencies = [ dependencies = [
"bytemuck", "bytemuck",
"emath 0.31.1 (git+https://github.com/damus-io/egui?rev=77eb8af1774367c0d4743f1d849a139ff4689614)", "emath 0.31.1 (git+https://github.com/damus-io/egui?rev=041d4d18b16cf8be97e0d7ef5892c87436352dfc)",
"serde", "serde",
] ]
[[package]] [[package]]
name = "eframe" name = "eframe"
version = "0.31.1" version = "0.31.1"
source = "git+https://github.com/damus-io/egui?rev=77eb8af1774367c0d4743f1d849a139ff4689614#77eb8af1774367c0d4743f1d849a139ff4689614" source = "git+https://github.com/damus-io/egui?rev=041d4d18b16cf8be97e0d7ef5892c87436352dfc#041d4d18b16cf8be97e0d7ef5892c87436352dfc"
dependencies = [ dependencies = [
"ahash", "ahash",
"bytemuck", "bytemuck",
@@ -1421,13 +1421,13 @@ dependencies = [
[[package]] [[package]]
name = "egui" name = "egui"
version = "0.31.1" version = "0.31.1"
source = "git+https://github.com/damus-io/egui?rev=77eb8af1774367c0d4743f1d849a139ff4689614#77eb8af1774367c0d4743f1d849a139ff4689614" source = "git+https://github.com/damus-io/egui?rev=041d4d18b16cf8be97e0d7ef5892c87436352dfc#041d4d18b16cf8be97e0d7ef5892c87436352dfc"
dependencies = [ dependencies = [
"accesskit", "accesskit",
"ahash", "ahash",
"backtrace", "backtrace",
"bitflags 2.9.1", "bitflags 2.9.1",
"emath 0.31.1 (git+https://github.com/damus-io/egui?rev=77eb8af1774367c0d4743f1d849a139ff4689614)", "emath 0.31.1 (git+https://github.com/damus-io/egui?rev=041d4d18b16cf8be97e0d7ef5892c87436352dfc)",
"epaint", "epaint",
"log", "log",
"nohash-hasher", "nohash-hasher",
@@ -1438,7 +1438,7 @@ dependencies = [
[[package]] [[package]]
name = "egui-wgpu" name = "egui-wgpu"
version = "0.31.1" version = "0.31.1"
source = "git+https://github.com/damus-io/egui?rev=77eb8af1774367c0d4743f1d849a139ff4689614#77eb8af1774367c0d4743f1d849a139ff4689614" source = "git+https://github.com/damus-io/egui?rev=041d4d18b16cf8be97e0d7ef5892c87436352dfc#041d4d18b16cf8be97e0d7ef5892c87436352dfc"
dependencies = [ dependencies = [
"ahash", "ahash",
"bytemuck", "bytemuck",
@@ -1457,7 +1457,7 @@ dependencies = [
[[package]] [[package]]
name = "egui-winit" name = "egui-winit"
version = "0.31.1" version = "0.31.1"
source = "git+https://github.com/damus-io/egui?rev=77eb8af1774367c0d4743f1d849a139ff4689614#77eb8af1774367c0d4743f1d849a139ff4689614" source = "git+https://github.com/damus-io/egui?rev=041d4d18b16cf8be97e0d7ef5892c87436352dfc#041d4d18b16cf8be97e0d7ef5892c87436352dfc"
dependencies = [ dependencies = [
"ahash", "ahash",
"arboard", "arboard",
@@ -1475,7 +1475,7 @@ dependencies = [
[[package]] [[package]]
name = "egui_extras" name = "egui_extras"
version = "0.31.1" version = "0.31.1"
source = "git+https://github.com/damus-io/egui?rev=77eb8af1774367c0d4743f1d849a139ff4689614#77eb8af1774367c0d4743f1d849a139ff4689614" source = "git+https://github.com/damus-io/egui?rev=041d4d18b16cf8be97e0d7ef5892c87436352dfc#041d4d18b16cf8be97e0d7ef5892c87436352dfc"
dependencies = [ dependencies = [
"ahash", "ahash",
"egui", "egui",
@@ -1492,7 +1492,7 @@ dependencies = [
[[package]] [[package]]
name = "egui_glow" name = "egui_glow"
version = "0.31.1" version = "0.31.1"
source = "git+https://github.com/damus-io/egui?rev=77eb8af1774367c0d4743f1d849a139ff4689614#77eb8af1774367c0d4743f1d849a139ff4689614" source = "git+https://github.com/damus-io/egui?rev=041d4d18b16cf8be97e0d7ef5892c87436352dfc#041d4d18b16cf8be97e0d7ef5892c87436352dfc"
dependencies = [ dependencies = [
"ahash", "ahash",
"bytemuck", "bytemuck",
@@ -1562,7 +1562,7 @@ checksum = "9e4cadcff7a5353ba72b7fea76bf2122b5ebdbc68e8155aa56dfdea90083fe1b"
[[package]] [[package]]
name = "emath" name = "emath"
version = "0.31.1" version = "0.31.1"
source = "git+https://github.com/damus-io/egui?rev=77eb8af1774367c0d4743f1d849a139ff4689614#77eb8af1774367c0d4743f1d849a139ff4689614" source = "git+https://github.com/damus-io/egui?rev=041d4d18b16cf8be97e0d7ef5892c87436352dfc#041d4d18b16cf8be97e0d7ef5892c87436352dfc"
dependencies = [ dependencies = [
"bytemuck", "bytemuck",
"serde", "serde",
@@ -1660,13 +1660,13 @@ dependencies = [
[[package]] [[package]]
name = "epaint" name = "epaint"
version = "0.31.1" version = "0.31.1"
source = "git+https://github.com/damus-io/egui?rev=77eb8af1774367c0d4743f1d849a139ff4689614#77eb8af1774367c0d4743f1d849a139ff4689614" source = "git+https://github.com/damus-io/egui?rev=041d4d18b16cf8be97e0d7ef5892c87436352dfc#041d4d18b16cf8be97e0d7ef5892c87436352dfc"
dependencies = [ dependencies = [
"ab_glyph", "ab_glyph",
"ahash", "ahash",
"bytemuck", "bytemuck",
"ecolor", "ecolor",
"emath 0.31.1 (git+https://github.com/damus-io/egui?rev=77eb8af1774367c0d4743f1d849a139ff4689614)", "emath 0.31.1 (git+https://github.com/damus-io/egui?rev=041d4d18b16cf8be97e0d7ef5892c87436352dfc)",
"epaint_default_fonts", "epaint_default_fonts",
"log", "log",
"nohash-hasher", "nohash-hasher",
@@ -1678,7 +1678,7 @@ dependencies = [
[[package]] [[package]]
name = "epaint_default_fonts" name = "epaint_default_fonts"
version = "0.31.1" version = "0.31.1"
source = "git+https://github.com/damus-io/egui?rev=77eb8af1774367c0d4743f1d849a139ff4689614#77eb8af1774367c0d4743f1d849a139ff4689614" source = "git+https://github.com/damus-io/egui?rev=041d4d18b16cf8be97e0d7ef5892c87436352dfc#041d4d18b16cf8be97e0d7ef5892c87436352dfc"
[[package]] [[package]]
name = "equator" name = "equator"

12
Cargo.toml
View File

@@ -92,12 +92,12 @@ strip = true # Strip symbols from binary*
#egui_extras = { path = "/home/jb55/dev/github/emilk/egui/crates/egui_extras" } #egui_extras = { path = "/home/jb55/dev/github/emilk/egui/crates/egui_extras" }
#epaint = { path = "/home/jb55/dev/github/emilk/egui/crates/epaint" } #epaint = { path = "/home/jb55/dev/github/emilk/egui/crates/epaint" }
egui = { git = "https://github.com/damus-io/egui", rev = "77eb8af1774367c0d4743f1d849a139ff4689614" } egui = { git = "https://github.com/damus-io/egui", rev = "041d4d18b16cf8be97e0d7ef5892c87436352dfc" }
eframe = { git = "https://github.com/damus-io/egui", rev = "77eb8af1774367c0d4743f1d849a139ff4689614" } eframe = { git = "https://github.com/damus-io/egui", rev = "041d4d18b16cf8be97e0d7ef5892c87436352dfc" }
egui-winit = { git = "https://github.com/damus-io/egui", rev = "77eb8af1774367c0d4743f1d849a139ff4689614" } egui-winit = { git = "https://github.com/damus-io/egui", rev = "041d4d18b16cf8be97e0d7ef5892c87436352dfc" }
egui-wgpu = { git = "https://github.com/damus-io/egui", rev = "77eb8af1774367c0d4743f1d849a139ff4689614" } egui-wgpu = { git = "https://github.com/damus-io/egui", rev = "041d4d18b16cf8be97e0d7ef5892c87436352dfc" }
egui_extras = { git = "https://github.com/damus-io/egui", rev = "77eb8af1774367c0d4743f1d849a139ff4689614" } egui_extras = { git = "https://github.com/damus-io/egui", rev = "041d4d18b16cf8be97e0d7ef5892c87436352dfc" }
epaint = { git = "https://github.com/damus-io/egui", rev = "77eb8af1774367c0d4743f1d849a139ff4689614" } epaint = { git = "https://github.com/damus-io/egui", rev = "041d4d18b16cf8be97e0d7ef5892c87436352dfc" }
puffin = { git = "https://github.com/jb55/puffin", package = "puffin", rev = "c6a6242adaf90b6292c0f462d2acd34d96d224d2" } puffin = { git = "https://github.com/jb55/puffin", package = "puffin", rev = "c6a6242adaf90b6292c0f462d2acd34d96d224d2" }
puffin_egui = { git = "https://github.com/jb55/puffin", package = "puffin_egui", rev = "c6a6242adaf90b6292c0f462d2acd34d96d224d2" } puffin_egui = { git = "https://github.com/jb55/puffin", package = "puffin_egui", rev = "c6a6242adaf90b6292c0f462d2acd34d96d224d2" }
#winit = { git = "https://github.com/damus-io/winit", rev = "14d61a74bee0c9863abe7ef28efae2c4d8bd3743" } #winit = { git = "https://github.com/damus-io/winit", rev = "14d61a74bee0c9863abe7ef28efae2c4d8bd3743" }

5
crates/notedeck_columns/src/app.rs
View File

@@ -75,6 +75,11 @@ fn handle_key_events(input: &egui::InputState, columns: &mut Columns) {
egui::Key::L => { egui::Key::L => {
columns.select_left(); columns.select_left();
} }
egui::Key::BrowserBack | egui::Key::Escape => {
if let Some(column) = columns.selected_mut() {
column.router_mut().go_back();
}
}
_ => {} _ => {}
} }
} }