Migrate to egui v0.29.1

Not too many breaking changes. I updated egui-nav and egui-tabs as well.

Fixes: #315
Changelog-Fixed: Fixed crash when navigating in debug mode
Changelog-Changed: Migrated to egui v0.29.1
Signed-off-by: William Casarin <[email protected]>

Author: jb55

Cargo.lock

@@ -14,9 +14,9 @@ description = "A multiplatform nostr client"
 crate-type = ["lib", "cdylib"]
 
 [workspace.dependencies]
-egui = { git = "https://github.com/emilk/egui", rev = "fcb7764e48ce00f8f8e58da10f937410d65b0bfb", features = ["serde"] }
-eframe = { git = "https://github.com/emilk/egui", rev = "fcb7764e48ce00f8f8e58da10f937410d65b0bfb", package = "eframe", default-features = false, features = [ "wgpu", "wayland", "x11", "android-native-activity" ] }
-egui_extras = { git = "https://github.com/emilk/egui", rev = "fcb7764e48ce00f8f8e58da10f937410d65b0bfb", package = "egui_extras", features = ["all_loaders"] }
+egui = { version = "0.29.1", features = ["serde"] }
+eframe = { version = "0.29.1", default-features = false, features = [ "wgpu", "wayland", "x11", "android-native-activity" ] }
+egui_extras = { version = "0.29.1", features = ["all_loaders"] }
 nostrdb = { git = "https://github.com/damus-io/nostrdb-rs", rev = "71154e4100775f6932ee517da4350c433ba14ec7" }
 
 [dependencies]
@@ -25,20 +25,17 @@ egui = { workspace = true }
 eframe = { workspace = true }
 egui_extras = { workspace = true }
 ehttp = "0.2.0"
-egui_tabs = { git = "https://github.com/damus-io/egui-tabs", branch = "egui-0.28" }
-egui_nav = { git = "https://github.com/damus-io/egui-nav", rev = "867fb6e057a4cc0a13716d59d6d332a4c90607ea" }
-egui_virtual_list = { git = "https://github.com/jb55/hello_egui", branch = "egui-0.28", package = "egui_virtual_list" }
+egui_tabs = "0.2.0"
+egui_nav = "0.2.0"
+egui_virtual_list = "0.5.0"
 reqwest = { version = "0.12.4", default-features = false, features = [ "rustls-tls-native-roots" ] }
 image = { version = "0.25", features = ["jpeg", "png", "webp"] }
 log = "0.4.17"
 poll-promise = { version = "0.3.0", features = ["tokio"] }
 serde_derive = "1"
 serde = { version = "1", features = ["derive"] } # You only need this if you want app persistence
 tracing = "0.1.40"
-#wasm-bindgen = "0.2.83"
 nostrdb = { workspace = true }
-#nostrdb = { path = "/Users/jb55/dev/github/damus-io/nostrdb-rs" }
-#nostrdb = "0.3.4"
 enostr = { path = "enostr" } 
 serde_json = "1.0.89"
 env_logger = "0.10.0"
@@ -142,8 +139,8 @@ path = "src/bin/notedeck.rs"
 name = "ui_preview"
 path = "src/ui_preview/main.rs"
 
-[patch.crates-io]
-egui = { git = "https://github.com/emilk/egui", rev = "fcb7764e48ce00f8f8e58da10f937410d65b0bfb" }
-eframe = { git = "https://github.com/emilk/egui", rev = "fcb7764e48ce00f8f8e58da10f937410d65b0bfb", package = "eframe"  }
-emath = { git = "https://github.com/emilk/egui", rev = "fcb7764e48ce00f8f8e58da10f937410d65b0bfb", package = "emath" }
-egui_extras = { git = "https://github.com/emilk/egui", rev = "fcb7764e48ce00f8f8e58da10f937410d65b0bfb", package = "egui_extras"  }
+#[patch.crates-io]
+#egui = "0.29.1"
+#eframe = "0.29.1"
+#emath = "0.29.1"
+#egui_extras = "0.29.1"

Cargo.toml

@@ -235,7 +235,7 @@ pub fn create_themed_visuals(theme: ColorTheme, default: Visuals) -> Visuals {
     }
 }
 
-pub static DECK_ICON_SIZE: f32 = 24.0;
+//pub static DECK_ICON_SIZE: f32 = 24.0;
 
 pub fn deck_icon_font_sized(size: f32) -> FontId {
     egui::FontId::new(size, emoji_font_family())

src/app_style.rs

@@ -58,6 +58,7 @@ fn available_characters(ui: &egui::Ui, family: egui::FontFamily) -> Vec<char> {
             .font(&egui::FontId::new(10.0, family)) // size is arbitrary for getting the characters
             .characters()
             .iter()
+            .map(|(chr, _v)| chr)
             .filter(|chr| !chr.is_whitespace() && !chr.is_ascii_control())
             .copied()
             .collect()

src/deck_state.rs

@@ -14,10 +14,10 @@ use crate::{
 
 static FALLBACK_PUBKEY: &str = "aa733081e4f0f79dd43023d8983265593f2b41a988671cfcef3f489b91ad93fe";
 
-pub enum DecksAction {
-    Switch(usize),
-    Removing(usize),
-}
+//pub enum DecksAction {
+//    Switch(usize),
+//    Removing(usize),
+//}
 
 pub struct DecksCache {
     pub account_to_decks: HashMap<Pubkey, Decks>,

src/decks.rs

@@ -248,7 +248,7 @@ pub fn render_nav(col: usize, app: &mut Damus, ui: &mut egui::Ui) -> RenderNavRe
     let col_id = get_active_columns(&app.accounts, &app.decks_cache).get_column_id_at_index(col);
     // TODO(jb55): clean up this router_mut mess by using Router<R> in egui-nav directly
 
-    let nav_response = Nav::new(app.columns().column(col).router().routes().clone())
+    let nav_response = Nav::new(&app.columns().column(col).router().routes().clone())
         .navigating(app.columns_mut().column_mut(col).router_mut().navigating)
         .returning(app.columns_mut().column_mut(col).router_mut().returning)
         .id_source(egui::Id::new(col_id))
@@ -258,7 +258,7 @@ pub fn render_nav(col: usize, app: &mut Damus, ui: &mut egui::Ui) -> RenderNavRe
                 &mut app.img_cache,
                 get_active_columns_mut(&app.accounts, &mut app.decks_cache),
                 app.accounts.get_selected_account().map(|a| &a.pubkey),
-                nav.routes_arr(),
+                nav.routes(),
             )
             .show(ui),
             NavUiType::Body => render_nav_body(ui, app, nav.routes().last().expect("top"), col),

src/nav.rs

@@ -244,7 +244,7 @@ fn image_carousel(
 
     ui.add_sized([width, height], |ui: &mut egui::Ui| {
         egui::ScrollArea::horizontal()
-            .id_source(carousel_id)
+            .id_salt(carousel_id)
             .show(ui, |ui| {
                 ui.horizontal(|ui| {
                     for image in images {

src/ui/note/contents.rs

@@ -50,7 +50,7 @@ impl<'a> ProfileView<'a> {
         let scroll_id = egui::Id::new(("profile_scroll", self.col_id, self.pubkey));
 
         ScrollArea::vertical()
-            .id_source(scroll_id)
+            .id_salt(scroll_id)
             .show(ui, |ui| {
                 let txn = Transaction::new(self.ndb).expect("txn");
                 if let Ok(profile) = self.ndb.get_profile_by_pubkey(&txn, self.pubkey.bytes()) {

src/ui/profile/mod.rs

@@ -65,7 +65,7 @@ impl<'a> RelayView<'a> {
                                 .inner_margin(Margin::symmetric(0.0, 4.0))
                                 .show(ui, |ui| {
                                     egui::ScrollArea::horizontal()
-                                        .id_source(index)
+                                        .id_salt(index)
                                         .max_width(
                                             ui.max_rect().width()
                                                 - get_right_side_width(relay_info.status),

src/ui/relay.rs

@@ -73,7 +73,7 @@ impl<'a> ThreadView<'a> {
         );
 
         egui::ScrollArea::vertical()
-            .id_source(self.id_source)
+            .id_salt(self.id_source)
             .animated(false)
             .auto_shrink([false, false])
             .scroll_bar_visibility(egui::scroll_area::ScrollBarVisibility::AlwaysVisible)

src/ui/thread.rs

@@ -97,7 +97,7 @@ fn timeline_ui(
     };
 
     egui::ScrollArea::vertical()
-        .id_source(scroll_id)
+        .id_salt(scroll_id)
         .animated(false)
         .auto_shrink([false, false])
         .scroll_bar_visibility(ScrollBarVisibility::AlwaysVisible)