Skip to content

Commit

Permalink
Update dependencies in Cargo.toml
Browse files Browse the repository at this point in the history
  • Loading branch information
KmolYuan committed Sep 27, 2024
1 parent 75ca4f3 commit 0437ddd
Show file tree
Hide file tree
Showing 4 changed files with 7 additions and 8 deletions.
9 changes: 4 additions & 5 deletions four-bar-ui/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -22,12 +22,12 @@ native = ["four-bar/clap", "four-bar/rayon", "image/rayon"]
native-win-release = ["winapi", "native"]

[dependencies]
eframe = { version = "0.28", default-features = false, features = [
eframe = { version = "0.29", default-features = false, features = [
"accesskit",
"persistence",
"glow",
] }
egui_plot = "0.28"
egui_plot = "0.29"
four-bar = { path = "../four-bar", version = "7", features = [
"csv",
"atlas",
Expand All @@ -38,7 +38,7 @@ image = { version = "0.25", default-features = false, features = [
"jpeg",
"gif",
] }
rfd = "0.14"
rfd = "0.15"
ron = { git = "https://github.com/ron-rs/ron" }
serde = { version = "1", features = ["derive"] }
smartcore = { version = "0.3", features = ["ndarray-bindings"] }
Expand All @@ -56,8 +56,7 @@ instant = { version = "0.1", features = ["wasm-bindgen"] }
tracing-wasm = "0.2"
wasm-bindgen = "0.2"
wasm-bindgen-futures = "0.4"
# FIXME: https://github.com/emilk/egui/issues/4961
web-sys = "=0.3.69"
web-sys = "0.3.70"

[target.'cfg(windows)'.dependencies]
# windows here!
Expand Down
2 changes: 1 addition & 1 deletion four-bar-ui/src/app.rs
Original file line number Diff line number Diff line change
Expand Up @@ -141,7 +141,7 @@ pub(crate) struct App {
}

impl App {
pub(crate) fn create(files: Vec<PathBuf>) -> eframe::AppCreator {
pub(crate) fn create(files: Vec<PathBuf>) -> eframe::AppCreator<'static> {
Box::new(|ctx| Self::new_boxed(ctx, files))
}

Expand Down
2 changes: 1 addition & 1 deletion four-bar-ui/src/app/proj.rs
Original file line number Diff line number Diff line change
Expand Up @@ -164,7 +164,7 @@ impl Projects {
}

pub(crate) fn select(&mut self, ui: &mut Ui) {
let combo = ComboBox::from_id_source("proj");
let combo = ComboBox::from_id_salt("proj");
if self.list.is_empty() {
combo.show_ui(ui, |_| ());
} else {
Expand Down
2 changes: 1 addition & 1 deletion four-bar-ui/src/app/widgets.rs
Original file line number Diff line number Diff line change
Expand Up @@ -218,7 +218,7 @@ pub(crate) fn combo_enum<H, E, F, T, const N: usize>(
T: Into<WidgetText>,
{
let mut i = list.iter().position(|opt| opt == value).unwrap();
if ComboBox::from_id_source(id)
if ComboBox::from_id_salt(id)
.selected_text(name(value))
.show_index(ui, &mut i, N, |i| name(&list[i]))
.changed()
Expand Down

0 comments on commit 0437ddd

Please sign in to comment.