Update egui

This commit is contained in:
2026-03-29 12:27:23 -04:00
parent 2414489ef2
commit 391702b3f3
18 changed files with 356 additions and 285 deletions
+4 -6
View File
@@ -1,6 +1,4 @@
use egui::{
Button, CentralPanel, Context, Label, Layout, TopBottomPanel, Ui, ViewportBuilder, ViewportId,
};
use egui::{Button, CentralPanel, Label, Layout, Panel, Ui, ViewportBuilder, ViewportId};
use egui_extras::{Column, TableBuilder};
use gilrs::{EventType, GamepadId};
use std::sync::RwLock;
@@ -172,8 +170,8 @@ impl AppWindow for InputWindow {
.with_inner_size((600.0, 400.0))
}
fn show(&mut self, ctx: &Context) {
TopBottomPanel::top("options").show(ctx, |ui| {
fn show(&mut self, ui: &mut Ui) {
Panel::top("options").show_inside(ui, |ui| {
ui.horizontal(|ui| {
let old_active_tab = self.active_tab;
ui.selectable_value(&mut self.active_tab, InputTab::Player1, "Player 1");
@@ -188,7 +186,7 @@ impl AppWindow for InputWindow {
}
});
});
CentralPanel::default().show(ctx, |ui| {
CentralPanel::default().show_inside(ui, |ui| {
match self.active_tab {
InputTab::Player1 => self.show_key_bindings(ui, SimId::Player1),
InputTab::Player2 => self.show_key_bindings(ui, SimId::Player2),