Skip to content

Commit

Permalink
Egui 0.30 update (WIP, right panel broken)
Browse files Browse the repository at this point in the history
  • Loading branch information
crumblingstatue committed Dec 17, 2024
1 parent 0418d4c commit 45a9934
Show file tree
Hide file tree
Showing 6 changed files with 66 additions and 88 deletions.
104 changes: 44 additions & 60 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

9 changes: 4 additions & 5 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -26,24 +26,23 @@ either = "1.10.0"
tree_magic_mini = { version = "3.1.4", features = ["tree_magic_db"] }
bytemuck = "1.15.0"
slotmap = { version = "1.0.7", features = ["serde"] }
egui-sfml = { version = "0.7.0", optional = true }
egui-sfml = { version = "0.8.0", optional = true }
num-traits = "0.2.18"
serde-big-array = "0.5.1"
egui = { version = "0.29", features = ["serde"] }
egui_extras = { version = "0.29", default-features = false }
egui = { version = "0.30", features = ["serde"] }
egui_extras = { version = "0.30", default-features = false }
itertools = "0.13"
sysinfo = { version = "0.33", default-features = false, features = ["system"] }
proc-maps = "0.4.0"
open = "5.1.2"
egui-modal = "0.5.0"
arboard = { version = "3.3.2", default-features = false }
paste = "1.0.14"
iced-x86 = "1.21.0"
strum = { version = "0.26.2", features = ["derive"] }
egui_code_editor = "0.2.10"
# luajit breaks with panic=abort, because it relies on unwinding for exception handling
mlua = { version = "0.10", features = ["lua54", "vendored"] }
egui-file-dialog = { git = "https://github.com/fluxxcode/egui-file-dialog.git", branch = "develop" }
egui-file-dialog = { git = "https://github.com/bircni/egui-file-dialog.git", branch = "bump_egui" }
human_bytes = "0.4.3"
shlex = "1.3.0"
smart-default = "0.7.1"
Expand Down
4 changes: 2 additions & 2 deletions src/app.rs
Original file line number Diff line number Diff line change
Expand Up @@ -231,11 +231,11 @@ impl App {
.button(egui::RichText::new("Save & Truncate").color(egui::Color32::RED))
.clicked()
{
modal.close();
modal.is_open = false;
cmd.push(Cmd::SaveTruncateFinish);
}
if ui.button("Cancel").clicked() {
modal.close();
modal.is_open = false;
}
}));
return Ok(());
Expand Down
Loading

0 comments on commit 45a9934

Please sign in to comment.