notedeck

commit faa40bb6163e5c1883e861bb5fe717adef2060e7
parent a77fe6ca00a1ae3e82e64904e31bc9d25a351492
Author: kernelkind <kernelkind@gmail.com>
Date:   Sat, 21 Jun 2025 20:56:07 -0400

tmp: upgrade `egui-nav` to use `ReturnType`

remove when damus-io/egui-nav merges

Signed-off-by: kernelkind <kernelkind@gmail.com>

Diffstat:
M
Cargo.lock
 | 
2
+-
M
Cargo.toml
 | 
2
+-
M
crates/notedeck_columns/src/nav.rs
 | 
6
+++---

3 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/Cargo.lock b/Cargo.lock
@@ -1489,7 +1489,7 @@ dependencies = [
 [[package]]
 name = "egui_nav"
 version = "0.2.0"
-source = "git+https://github.com/damus-io/egui-nav?rev=0f0cbdd3184f3ff5fdf69ada08416ffc58a70d7a#0f0cbdd3184f3ff5fdf69ada08416ffc58a70d7a"
+source = "git+https://github.com/kernelkind/egui-nav?rev=111de8ac40b5d18df53e9691eb18a50d49cb31d8#111de8ac40b5d18df53e9691eb18a50d49cb31d8"
 dependencies = [
  "egui",
  "egui_extras",
diff --git a/Cargo.toml b/Cargo.toml
@@ -23,7 +23,7 @@ egui = { version = "0.31.1", features = ["serde"] }
 egui-wgpu = "0.31.1"
 egui_extras = { version = "0.31.1", features = ["all_loaders"] }
 egui-winit = { version = "0.31.1", features = ["android-game-activity", "clipboard"] }
-egui_nav = { git = "https://github.com/damus-io/egui-nav", rev = "0f0cbdd3184f3ff5fdf69ada08416ffc58a70d7a" }
+egui_nav = { git = "https://github.com/kernelkind/egui-nav", rev = "111de8ac40b5d18df53e9691eb18a50d49cb31d8" }
 egui_tabs = { git = "https://github.com/damus-io/egui-tabs", rev = "6eb91740577b374a8a6658c09c9a4181299734d0" }
 #egui_virtual_list = "0.6.0"
 egui_virtual_list = { git = "https://github.com/jb55/hello_egui", rev = "a66b6794f5e707a2f4109633770e02b02fb722e1" }
diff --git a/crates/notedeck_columns/src/nav.rs b/crates/notedeck_columns/src/nav.rs
@@ -182,7 +182,7 @@ fn process_popup_resp(
         process_result = process_render_nav_action(app, ctx, ui, col, nav_action);
     }
 
-    if let Some(NavAction::Returned) = action.action {
+    if let Some(NavAction::Returned(_)) = action.action {
         let column = app.columns_mut(ctx.accounts).column_mut(col);
         column.sheet_router.clear();
     } else if let Some(NavAction::Navigating) = action.action {
@@ -210,7 +210,7 @@ fn process_nav_resp(
 
     if let Some(action) = response.action {
         match action {
-            NavAction::Returned => {
+            NavAction::Returned(_) => {
                 let r = app
                     .columns_mut(ctx.accounts)
                     .column_mut(col)
@@ -237,7 +237,7 @@ fn process_nav_resp(
             }
 
             NavAction::Dragging => {}
-            NavAction::Returning => {}
+            NavAction::Returning(_) => {}
             NavAction::Resetting => {}
             NavAction::Navigating => {}
         }