notedeck

commit c0c2120f746e9d620536b00828d4d48e9d37452d
parent db6f02084d611ace079b673c9bbc5886d18b894a
Author: William Casarin <jb55@jb55.com>
Date:   Thu, 17 Jul 2025 09:18:20 -0700

android: fix back button

Fixes: https://github.com/damus-io/notedeck/issues/972
Signed-off-by: William Casarin <jb55@jb55.com>

Diffstat:
M
Cargo.lock
 | 
26
+++++++++++++-------------
M
Cargo.toml
 | 
12
++++++------
M
crates/notedeck_columns/src/app.rs
 | 
5
+++++

3 files changed, 24 insertions(+), 19 deletions(-)
diff --git a/Cargo.lock b/Cargo.lock
@@ -1375,17 +1375,17 @@ checksum = "d8b14ccef22fc6f5a8f4d7d768562a182c04ce9a3b3157b91390b52ddfdf1a76"
 [[package]]
 name = "ecolor"
 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 = [
  "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",
 ]
 
 [[package]]
 name = "eframe"
 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 = [
  "ahash",
  "bytemuck",
@@ -1421,13 +1421,13 @@ dependencies = [
 [[package]]
 name = "egui"
 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 = [
  "accesskit",
  "ahash",
  "backtrace",
  "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",
  "log",
  "nohash-hasher",
@@ -1438,7 +1438,7 @@ dependencies = [
 [[package]]
 name = "egui-wgpu"
 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 = [
  "ahash",
  "bytemuck",
@@ -1457,7 +1457,7 @@ dependencies = [
 [[package]]
 name = "egui-winit"
 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 = [
  "ahash",
  "arboard",
@@ -1475,7 +1475,7 @@ dependencies = [
 [[package]]
 name = "egui_extras"
 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 = [
  "ahash",
  "egui",
@@ -1492,7 +1492,7 @@ dependencies = [
 [[package]]
 name = "egui_glow"
 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 = [
  "ahash",
  "bytemuck",
@@ -1562,7 +1562,7 @@ checksum = "9e4cadcff7a5353ba72b7fea76bf2122b5ebdbc68e8155aa56dfdea90083fe1b"
 [[package]]
 name = "emath"
 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 = [
  "bytemuck",
  "serde",
@@ -1660,13 +1660,13 @@ dependencies = [
 [[package]]
 name = "epaint"
 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 = [
  "ab_glyph",
  "ahash",
  "bytemuck",
  "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",
  "log",
  "nohash-hasher",
@@ -1678,7 +1678,7 @@ dependencies = [
 [[package]]
 name = "epaint_default_fonts"
 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]]
 name = "equator"
diff --git a/Cargo.toml b/Cargo.toml
@@ -92,12 +92,12 @@ strip = true        # Strip symbols from binary*
 #egui_extras = { path = "/home/jb55/dev/github/emilk/egui/crates/egui_extras" }
 #epaint = { path = "/home/jb55/dev/github/emilk/egui/crates/epaint" }
 
-egui = { git = "https://github.com/damus-io/egui", rev = "77eb8af1774367c0d4743f1d849a139ff4689614" }
-eframe = { git = "https://github.com/damus-io/egui", rev = "77eb8af1774367c0d4743f1d849a139ff4689614" }
-egui-winit = { git = "https://github.com/damus-io/egui", rev = "77eb8af1774367c0d4743f1d849a139ff4689614" }
-egui-wgpu = { git = "https://github.com/damus-io/egui", rev = "77eb8af1774367c0d4743f1d849a139ff4689614" }
-egui_extras = { git = "https://github.com/damus-io/egui", rev = "77eb8af1774367c0d4743f1d849a139ff4689614" }
-epaint = { 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 = "041d4d18b16cf8be97e0d7ef5892c87436352dfc" }
+egui-winit = { git = "https://github.com/damus-io/egui", rev = "041d4d18b16cf8be97e0d7ef5892c87436352dfc" }
+egui-wgpu = { git = "https://github.com/damus-io/egui", rev = "041d4d18b16cf8be97e0d7ef5892c87436352dfc" }
+egui_extras = { git = "https://github.com/damus-io/egui", rev = "041d4d18b16cf8be97e0d7ef5892c87436352dfc" }
+epaint = { git = "https://github.com/damus-io/egui", rev = "041d4d18b16cf8be97e0d7ef5892c87436352dfc" }
 puffin = { git = "https://github.com/jb55/puffin", package = "puffin", 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" }
diff --git a/crates/notedeck_columns/src/app.rs b/crates/notedeck_columns/src/app.rs
@@ -75,6 +75,11 @@ fn handle_key_events(input: &egui::InputState, columns: &mut Columns) {
                 egui::Key::L => {
                     columns.select_left();
                 }
+                egui::Key::BrowserBack | egui::Key::Escape => {
+                    if let Some(column) = columns.selected_mut() {
+                        column.router_mut().go_back();
+                    }
+                }
                 _ => {}
             }
         }