aljaz/notedeck
1
0
Fork 0
mirror of https://github.com/aljazceru/notedeck.git synced 2025-12-19 09:34:19 +01:00
Code Issues Packages Projects Releases Wiki Activity

tmp: upgrade egui-nav to use ReturnType

Browse Source 
remove when damus-io/egui-nav merges

Signed-off-by: kernelkind <kernelkind@gmail.com>
This commit is contained in:
kernelkind
2025-06-21 20:56:07 -04:00
parent a77fe6ca00
commit faa40bb616
3 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Cargo.lock generated
View File

@@ -1489,7 +1489,7 @@ dependencies = [
[[package]] [[package]]
name = "egui_nav" name = "egui_nav"
version = "0.2.0" 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 = [ dependencies = [
"egui", "egui",
"egui_extras", "egui_extras",

2
Cargo.toml
View File

@@ -23,7 +23,7 @@ egui = { version = "0.31.1", features = ["serde"] }
egui-wgpu = "0.31.1" egui-wgpu = "0.31.1"
egui_extras = { version = "0.31.1", features = ["all_loaders"] } egui_extras = { version = "0.31.1", features = ["all_loaders"] }
egui-winit = { version = "0.31.1", features = ["android-game-activity", "clipboard"] } 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_tabs = { git = "https://github.com/damus-io/egui-tabs", rev = "6eb91740577b374a8a6658c09c9a4181299734d0" }
#egui_virtual_list = "0.6.0" #egui_virtual_list = "0.6.0"
egui_virtual_list = { git = "https://github.com/jb55/hello_egui", rev = "a66b6794f5e707a2f4109633770e02b02fb722e1" } egui_virtual_list = { git = "https://github.com/jb55/hello_egui", rev = "a66b6794f5e707a2f4109633770e02b02fb722e1" }

6
crates/notedeck_columns/src/nav.rs
View File

@@ -182,7 +182,7 @@ fn process_popup_resp(
process_result = process_render_nav_action(app, ctx, ui, col, nav_action); 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); let column = app.columns_mut(ctx.accounts).column_mut(col);
column.sheet_router.clear(); column.sheet_router.clear();
} else if let Some(NavAction::Navigating) = action.action { } else if let Some(NavAction::Navigating) = action.action {
@@ -210,7 +210,7 @@ fn process_nav_resp(
if let Some(action) = response.action { if let Some(action) = response.action {
match action { match action {
NavAction::Returned => { NavAction::Returned(_) => {
let r = app let r = app
.columns_mut(ctx.accounts) .columns_mut(ctx.accounts)
.column_mut(col) .column_mut(col)
@@ -237,7 +237,7 @@ fn process_nav_resp(
} }
NavAction::Dragging => {} NavAction::Dragging => {}
NavAction::Returning => {} NavAction::Returning(_) => {}
NavAction::Resetting => {} NavAction::Resetting => {}
NavAction::Navigating => {} NavAction::Navigating => {}
} }