Update dependencies
This commit is contained in:
+1
-1
@@ -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
@@ -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
@@ -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();
|
||||
|
||||
@@ -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
@@ -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),
|
||||
|
||||
@@ -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(
|
||||
|
||||
@@ -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])
|
||||
|
||||
@@ -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))
|
||||
|
||||
@@ -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))
|
||||
|
||||
@@ -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))
|
||||
|
||||
@@ -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))
|
||||
|
||||
@@ -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();
|
||||
|
||||
@@ -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))
|
||||
|
||||
Reference in New Issue
Block a user