Skip to content

Commit

Permalink
core,desktop: Update wgpu to v0.20.1, bump egui
Browse files Browse the repository at this point in the history
  • Loading branch information
torokati44 committed Jun 18, 2024
1 parent e833908 commit 35f5227
Show file tree
Hide file tree
Showing 6 changed files with 31 additions and 50 deletions.
58 changes: 17 additions & 41 deletions Cargo.lock

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

4 changes: 2 additions & 2 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -49,8 +49,8 @@ version = "0.1.0"
tracing = "0.1.40"
tracing-subscriber = { version = "0.3.18", features = ["env-filter"] }
naga = { version = "0.20.0", features = ["wgsl-out"] }
wgpu = "0.20.0"
egui = { git = "https://github.com/emilk/egui.git", rev = "738ea75453567c5f17a543e68aec8c48097cae7b" }
wgpu = "0.20.1"
egui = { git = "https://github.com/emilk/egui.git", rev = "413843dd7ca7c177aaac233cd24b547d2b904d19" }
clap = { version = "4.5.7", features = ["derive"] }
anyhow = "1.0"
slotmap = "1.0.7"
Expand Down
2 changes: 1 addition & 1 deletion core/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ hashbrown = { version = "0.14.5", features = ["raw"] }
scopeguard = "1.2.0"
fluent-templates = "0.9.4"
egui = { workspace = true, optional = true }
egui_extras = { git = "https://github.com/emilk/egui.git", rev = "738ea75453567c5f17a543e68aec8c48097cae7b", optional = true }
egui_extras = { git = "https://github.com/emilk/egui.git", rev = "413843dd7ca7c177aaac233cd24b547d2b904d19", optional = true }
png = { version = "0.17.13", optional = true }
flv-rs = { path = "../flv" }
async-channel = { workspace = true }
Expand Down
6 changes: 3 additions & 3 deletions desktop/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -14,10 +14,10 @@ workspace = true
clap = { workspace = true }
cpal = "0.15.3"
egui = { workspace = true }
egui_extras = { git = "https://github.com/emilk/egui.git", rev = "738ea75453567c5f17a543e68aec8c48097cae7b", features = ["image"] }
egui-wgpu = { git = "https://github.com/emilk/egui.git", rev = "738ea75453567c5f17a543e68aec8c48097cae7b", features = ["winit"] }
egui_extras = { git = "https://github.com/emilk/egui.git", rev = "413843dd7ca7c177aaac233cd24b547d2b904d19", features = ["image"] }
egui-wgpu = { git = "https://github.com/emilk/egui.git", rev = "413843dd7ca7c177aaac233cd24b547d2b904d19", features = ["winit"] }
image = { workspace = true, features = ["png"] }
egui-winit = { git = "https://github.com/emilk/egui.git", rev = "738ea75453567c5f17a543e68aec8c48097cae7b" }
egui-winit = { git = "https://github.com/emilk/egui.git", rev = "413843dd7ca7c177aaac233cd24b547d2b904d19" }
fontdb = "0.18"
ruffle_core = { path = "../core", features = ["audio", "clap", "mp3", "nellymoser", "default_compatibility_rules", "egui"] }
ruffle_render = { path = "../render", features = ["clap"] }
Expand Down
3 changes: 2 additions & 1 deletion desktop/src/gui/context_menu.rs
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,8 @@ impl ContextMenu {
let clicked = if item.checked {
Checkbox::new(&mut true, &item.caption).ui(ui).clicked()
} else {
let button = Button::new(&item.caption).wrap(false);
let button = Button::new(&item.caption)
.wrap_mode(egui::TextWrapMode::Extend);

ui.add_enabled(item.enabled, button).clicked()
};
Expand Down
8 changes: 6 additions & 2 deletions desktop/src/gui/dialogs/bookmarks_dialog.rs
Original file line number Diff line number Diff line change
Expand Up @@ -175,13 +175,17 @@ impl BookmarksDialog {
}

row.col(|ui| {
ui.add(Label::new(&bookmark.name).selectable(false).wrap(false));
ui.add(
Label::new(&bookmark.name)
.selectable(false)
.wrap_mode(egui::TextWrapMode::Extend),
);
});
row.col(|ui| {
ui.add(
Label::new(bookmark.url.as_str())
.selectable(false)
.wrap(false),
.wrap_mode(egui::TextWrapMode::Extend),
);
});

Expand Down

0 comments on commit 35f5227

Please sign in to comment.