Update dependencies

This commit is contained in:
2026-09-06 17:24:59 -04:00
parent ec7a89d9da
commit 7d517e932e
17 changed files with 575 additions and 515 deletions
+5 -3
View File
@@ -56,7 +56,7 @@ impl SharedViewportState {
fn init_painter(&mut self, ctx: &Context, window: &Window) -> &mut Painter {
if self.painter.is_none() {
let wgpu_config = egui_wgpu::WgpuConfiguration {
present_mode: wgpu::PresentMode::AutoVsync,
surface: egui_wgpu::SurfaceConfig::HIGH_THROUGHPUT,
wgpu_setup: egui_wgpu::WgpuSetup::Existing(self.wgpu.init(window)),
..egui_wgpu::WgpuConfiguration::default()
};
@@ -257,7 +257,7 @@ impl Application {
continue;
}
input.viewports = self.shared.viewport_info.clone();
let output = self.ctx.run_ui(input, |ui| {
let mut output = self.ctx.run_ui(input, |ui| {
if viewport.id == ViewportId::ROOT {
self.app.show(ui);
} else if let Some(cb) = ui.viewport(|v| v.viewport_ui_cb.clone()) {
@@ -304,8 +304,9 @@ impl Application {
output.pixels_per_point,
[0.0, 0.0, 0.0, 0.0],
&clipped_primitives,
&output.textures_delta,
&mut output.textures_delta,
vec![],
&viewport.window,
);
}
let mut active_viewports = ViewportIdSet::default();
@@ -550,6 +551,7 @@ impl WgpuState {
power_preference,
compatible_surface: Some(&surface),
force_fallback_adapter,
apply_limit_buckets: false,
}))
.expect("could not create adapter");
debug!("selected adapter: {:?}", adapter.get_info());
+1 -1
View File
@@ -12,7 +12,7 @@ impl AppWindow for AboutWindow {
}
fn show(&mut self, ui: &mut Ui) {
CentralPanel::default().show_inside(ui, |ui| {
CentralPanel::default().show(ui, |ui| {
ui.vertical_centered(|ui| {
ui.label("Lemur Virtual Boy Emulator");
ui.label(format!("Version {}", env!("CARGO_PKG_VERSION")));
+5 -7
View File
@@ -708,13 +708,11 @@ impl AppWindow for GameWindow {
while let Ok(toast) = self.messages.try_recv() {
self.toasts.add(toast);
}
Panel::top("menubar")
.exact_size(22.0)
.show_inside(ui, |ui| {
MenuBar::new().ui(ui, |ui| {
self.show_menu(ui);
});
Panel::top("menubar").exact_size(22.0).show(ui, |ui| {
MenuBar::new().ui(ui, |ui| {
self.show_menu(ui);
});
});
if self.color_picker.is_some() {
Window::new("Color Picker")
.title_bar(false)
@@ -725,7 +723,7 @@ impl AppWindow for GameWindow {
});
}
let frame = Frame::central_panel(ui.style()).fill(Color32::BLACK);
CentralPanel::default().frame(frame).show_inside(ui, |ui| {
CentralPanel::default().frame(frame).show(ui, |ui| {
if let Some(screen) = self.screen.as_mut() {
screen.update(self.config.display_mode, self.config.colors);
ui.add(screen);
+1 -1
View File
@@ -55,7 +55,7 @@ impl AppWindow for GdbServerWindow {
fn show(&mut self, ui: &mut egui::Ui) {
let port_num: Option<u16> = self.port_str.parse().ok();
let status = self.server.status();
CentralPanel::default().show_inside(ui, |ui| {
CentralPanel::default().show(ui, |ui| {
ui.horizontal(|ui| {
if port_num.is_none() {
let style = ui.style_mut();
+1 -1
View File
@@ -131,7 +131,7 @@ impl AppWindow for HotkeysWindow {
}
fn show(&mut self, ui: &mut Ui) {
CentralPanel::default().show_inside(ui, |ui| {
CentralPanel::default().show(ui, |ui| {
ui.horizontal(|ui| {
if ui.button("Use defaults").clicked() {
self.shortcuts.reset();
+3 -3
View File
@@ -70,7 +70,7 @@ impl InputWindow {
.column(Column::remainder())
.cell_layout(Layout::left_to_right(egui::Align::Center))
.body(|mut body| {
for keys in KEY_NAMES.chunks_exact(2) {
for keys in KEY_NAMES.as_chunks::<2>().0 {
body.row(20.0, |mut row| {
for (key, name) in keys {
let binding = names.remove(key).map(|mut s| {
@@ -167,7 +167,7 @@ impl AppWindow for InputWindow {
}
fn show(&mut self, ui: &mut Ui) {
Panel::top("options").show_inside(ui, |ui| {
Panel::top("options").show(ui, |ui| {
ui.horizontal(|ui| {
let old_active_tab = self.active_tab;
ui.selectable_value(&mut self.active_tab, InputTab::Player1, "Player 1");
@@ -182,7 +182,7 @@ impl AppWindow for InputWindow {
}
});
});
CentralPanel::default().show_inside(ui, |ui| {
CentralPanel::default().show(ui, |ui| {
match self.active_tab {
InputTab::Player1 => self.show_key_bindings(ui, SimId::Player1),
InputTab::Player2 => self.show_key_bindings(ui, SimId::Player2),
+1 -1
View File
@@ -94,7 +94,7 @@ impl AppWindow for ProfileWindow {
fn show(&mut self, ui: &mut egui::Ui) {
let status = self.profiler.status();
let recording = matches!(status, ProfilerStatus::Recording);
CentralPanel::default().show_inside(ui, |ui| {
CentralPanel::default().show(ui, |ui| {
ui.horizontal_wrapped(|ui| {
ui.spacing_mut().item_spacing.x = 0.0;
ui.add(
+1 -1
View File
@@ -54,7 +54,7 @@ impl AppWindow for TerminalWindow {
}
self.lines.back_mut().unwrap().push_str(rest);
}
CentralPanel::default().show_inside(ui, |ui| {
CentralPanel::default().show(ui, |ui| {
ScrollArea::vertical()
.stick_to_bottom(true)
.auto_shrink([false, false])
+1 -1
View File
@@ -203,7 +203,7 @@ impl AppWindow for BgMapWindow {
fn show(&mut self, ui: &mut Ui) {
self.state.load(ui);
CentralPanel::default().show_inside(ui, |ui| {
CentralPanel::default().show(ui, |ui| {
ui.horizontal_top(|ui| {
StripBuilder::new(ui)
.size(Size::relative(0.3).at_most(200.0))
+1 -1
View File
@@ -263,7 +263,7 @@ impl AppWindow for CharacterDataWindow {
fn show(&mut self, ui: &mut Ui) {
self.state.load(ui);
CentralPanel::default().show_inside(ui, |ui| {
CentralPanel::default().show(ui, |ui| {
ui.horizontal_top(|ui| {
StripBuilder::new(ui)
.size(Size::relative(0.3).at_most(200.0))
+1 -1
View File
@@ -163,7 +163,7 @@ impl AppWindow for FrameBufferWindow {
fn show(&mut self, ui: &mut Ui) {
self.state.load(ui);
CentralPanel::default().show_inside(ui, |ui| {
CentralPanel::default().show(ui, |ui| {
ui.horizontal_top(|ui| {
StripBuilder::new(ui)
.size(Size::relative(0.3).at_most(200.0))
+1 -1
View File
@@ -219,7 +219,7 @@ impl AppWindow for ObjectWindow {
fn show(&mut self, ui: &mut Ui) {
self.state.load(ui);
CentralPanel::default().show_inside(ui, |ui| {
CentralPanel::default().show(ui, |ui| {
ui.horizontal_top(|ui| {
StripBuilder::new(ui)
.size(Size::relative(0.3).at_most(200.0))
+1 -1
View File
@@ -641,7 +641,7 @@ impl AppWindow for RegisterWindow {
}
fn show(&mut self, ui: &mut Ui) {
CentralPanel::default().show_inside(ui, |ui| {
CentralPanel::default().show(ui, |ui| {
ScrollArea::vertical().show(ui, |ui| {
ui.horizontal_top(|ui| {
let width = ui.available_width();
+1 -1
View File
@@ -539,7 +539,7 @@ impl AppWindow for WorldWindow {
fn show(&mut self, ui: &mut Ui) {
self.state.load(ui);
CentralPanel::default().show_inside(ui, |ui| {
CentralPanel::default().show(ui, |ui| {
ui.horizontal_top(|ui| {
StripBuilder::new(ui)
.size(Size::relative(0.3).at_most(200.0))