Switch to egui master to fix wgpu issues

There are some wgpu issues that are fixed in egui-master, so
let's switch to that.

This fixes notedeck so that it runs on both my intel graphics laptop
and amdgpu desktop.

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

Cargo.toml

@@ -13,14 +13,13 @@ crate-type = ["lib", "cdylib"]
 
 [dependencies]
 #egui-android = { git = "https://github.com/jb55/egui-android.git" }
-egui = "0.27.2"
+egui = { git = "https://github.com/emilk/egui", rev = "fcb7764e48ce00f8f8e58da10f937410d65b0bfb" }
-eframe = { version = "0.27.2", default-features = false, features = [ "glow", "wayland", "x11", "android-native-activity" ] }
+eframe = { git = "https://github.com/emilk/egui", rev = "fcb7764e48ce00f8f8e58da10f937410d65b0bfb", package = "eframe", default-features = false, features = [ "wgpu", "wayland", "x11", "android-native-activity" ] }
-#eframe = { version = "0.27.2", default-features = false, features = [ "glow", "android-native-activity" ] }
+egui_extras = { git = "https://github.com/emilk/egui", rev = "fcb7764e48ce00f8f8e58da10f937410d65b0bfb", package = "egui_extras", features = ["all_loaders"] }
-#eframe = "0.22.0"
-egui_extras = { version = "0.27.2", features = ["all_loaders"] }
 ehttp = "0.2.0"
-egui_tabs = { git = "https://github.com/damus-io/egui-tabs", rev = "120971fc43db6ba0b6f194f4bd4a66f7e00a4e22" }
+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 = "0498cbee12935448478823d855060dc749a0b8b6" }
+egui_nav = { git = "https://github.com/damus-io/egui-nav", branch = "egui-0.28" }
+egui_virtual_list = { git = "https://github.com/jb55/hello_egui", branch = "egui-0.28", package = "egui_virtual_list" }
 reqwest = { version = "0.12.4", default-features = false, features = [ "rustls-tls-native-roots" ] }
 image = { version = "0.24", features = ["jpeg", "png", "webp"] }
 log = "0.4.17"
@@ -41,7 +40,6 @@ base32 = "0.4.0"
 strum = "0.26"
 strum_macros = "0.26"
 bitflags = "2.5.0"
-egui_virtual_list = "0.3.0"
 
 [target.'cfg(target_os = "macos")'.dependencies]
 security-framework = "2.11.0"
@@ -113,3 +111,9 @@ path = "src/bin/notedeck.rs"
 [[bin]]
 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"  }

src/bin/notedeck.rs

@@ -17,7 +17,7 @@ async fn main() {
     let _res = eframe::run_native(
         "Damus NoteDeck",
         generate_native_options(),
-        Box::new(|cc| Box::new(Damus::new(cc, ".", std::env::args().collect()))),
+        Box::new(|cc| Ok(Box::new(Damus::new(cc, ".", std::env::args().collect())))),
     );
 }
 

src/lib.rs

@@ -65,9 +65,9 @@ pub async fn android_main(app: AndroidApp) {
         builder.with_android_app(app);
     }));
 
-    let res_ = eframe::run_native(
+    let _res = eframe::run_native(
         "Damus NoteDeck",
         options,
-        Box::new(|cc| Box::new(Damus::new(cc, path, vec![]))),
+        Box::new(|cc| Ok(Box::new(Damus::new(cc, path, vec![])))),
     );
 }

src/ui/account_login_view.rs

@@ -296,7 +296,7 @@ fn show_error(ui: &mut egui::Ui, err: &LoginError) {
                 egui::Label::new(RichText::new(e).color(ui.visuals().error_fg_color))
             }
         };
-        ui.add(error_label.truncate(true));
+        ui.add(error_label.truncate());
     });
 }
 

src/ui_preview/main.rs

@@ -42,7 +42,7 @@ impl PreviewRunner {
             Box::new(move |cc| {
                 let app = Into::<PreviewApp>::into(preview);
                 setup_cc(cc, is_mobile, light_mode);
-                Box::new(app)
+                Ok(Box::new(app))
             }),
         );
     }