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>
This commit is contained in:
@@ -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())))),
|
||||
);
|
||||
}
|
||||
|
||||
|
||||
@@ -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![])))),
|
||||
);
|
||||
}
|
||||
|
||||
@@ -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());
|
||||
});
|
||||
}
|
||||
|
||||
|
||||
@@ -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))
|
||||
}),
|
||||
);
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user