PVB/lemur
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 50 Wiki Activity

Update egui

Browse Source
This commit is contained in:
SonicSwordcane
2026-03-29 12:27:23 -04:00
parent 2414489ef2
commit 391702b3f3
18 changed files with 356 additions and 285 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/app.rs
+5 -5
View File
@@ -385,9 +385,9 @@ impl WgpuState {
#[cfg(windows)]
let backends = wgpu::Backends::from_env()
.unwrap_or((wgpu::Backends::PRIMARY | wgpu::Backends::GL) - wgpu::Backends::VULKAN);
let instance = wgpu::Instance::new(&wgpu::InstanceDescriptor {
let instance = wgpu::Instance::new(wgpu::InstanceDescriptor {
backends,
..wgpu::InstanceDescriptor::default()
..wgpu::InstanceDescriptor::new_without_display_handle_from_env()
});
let adapter = pollster::block_on(instance.request_adapter(&wgpu::RequestAdapterOptions {
@@ -441,7 +441,7 @@ impl Viewport {
.unwrap()
.insert(0, "Selawik".into());
ctx.set_fonts(fonts);
ctx.style_mut(|s| {
ctx.global_style_mut(|s| {
s.wrap_mode = Some(TextWrapMode::Extend);
s.visuals.menu_corner_radius = Default::default();
s.spacing.scroll = ScrollStyle::thin();
@@ -528,8 +528,8 @@ impl Viewport {
fn redraw(&mut self, event_loop: &ActiveEventLoop) -> Option<Action> {
let mut input = self.state.take_egui_input(&self.window);
input.viewports = std::iter::once((ViewportId::ROOT, self.info.clone())).collect();
let mut output = self.ctx.run(input, |ctx| {
self.app.show(ctx);
let mut output = self.ctx.run_ui(input, |ui| {
self.app.show(ui);
});
let clipped_primitives = self.ctx.tessellate(output.shapes, output.pixels_per_point);
self.painter.paint_and_update_textures(
src/window.rs
+2 -2
View File
@@ -1,7 +1,7 @@
use std::sync::Arc;
pub use about::AboutWindow;
use egui::{Context, ViewportBuilder, ViewportId};
use egui::{Context, Ui, ViewportBuilder, ViewportId};
pub use game::GameWindow;
pub use game_screen::DisplayMode;
pub use gdb::GdbServerWindow;
@@ -33,7 +33,7 @@ pub trait AppWindow {
SimId::Player1
}
fn initial_viewport(&self) -> ViewportBuilder;
fn show(&mut self, ctx: &Context);
fn show(&mut self, ui: &mut Ui);
fn on_init(&mut self, args: InitArgs) {
let _ = args;
}
src/window/about.rs
+3 -3
View File
@@ -1,4 +1,4 @@
use egui::{CentralPanel, Context, Image, ViewportBuilder, ViewportId};
use egui::{CentralPanel, Image, Ui, ViewportBuilder, ViewportId};
use super::AppWindow;
@@ -15,8 +15,8 @@ impl AppWindow for AboutWindow {
.with_inner_size((300.0, 200.0))
}
fn show(&mut self, ctx: &Context) {
CentralPanel::default().show(ctx, |ui| {
fn show(&mut self, ui: &mut Ui) {
CentralPanel::default().show_inside(ui, |ui| {
ui.vertical_centered(|ui| {
ui.label("Lemur Virtual Boy Emulator");
ui.label(format!("Version {}", env!("CARGO_PKG_VERSION")));
src/window/game.rs
+16 -16
View File
@@ -13,7 +13,7 @@ use crate::{
};
use anyhow::Context as _;
use egui::{
Align2, Button, CentralPanel, Color32, Context, Frame, MenuBar, TopBottomPanel, Ui, Vec2,
Align2, Button, CentralPanel, Color32, Context, Frame, MenuBar, Panel, Ui, Vec2,
ViewportBuilder, ViewportCommand, ViewportId, Window,
};
use egui_notify::{Anchor, Toast, Toasts};
@@ -67,7 +67,7 @@ impl GameWindow {
}
}
fn show_menu(&mut self, ctx: &Context, ui: &mut Ui) {
fn show_menu(&mut self, ui: &mut Ui) {
let state = self.client.emulator_state();
let is_ready = self.client.sim_state(self.sim_id) == SimState::Ready;
let can_pause = is_ready && state == EmulatorState::Running;
@@ -208,7 +208,7 @@ impl GameWindow {
pollster::block_on(self.take_screenshot());
}
});
ui.menu_button("Options", |ui| self.show_options_menu(ctx, ui));
ui.menu_button("Options", |ui| self.show_options_menu(ui));
ui.menu_button("Multiplayer", |ui| {
let has_player_2 = self.client.sim_state(SimId::Player2) != SimState::Uninitialized;
if self.sim_id == SimId::Player1
@@ -328,7 +328,7 @@ impl GameWindow {
Ok(Some(path.display().to_string()))
}
fn show_options_menu(&mut self, ctx: &Context, ui: &mut Ui) {
fn show_options_menu(&mut self, ui: &mut Ui) {
ui.menu_button("Video", |ui| {
ui.menu_button("Screen Size", |ui| {
let current_dims = self.config.dimensions;
@@ -344,7 +344,7 @@ impl GameWindow {
.selectable_button((current_dims - dims).length() < 1.0, label)
.clicked()
{
ctx.send_viewport_cmd(ViewportCommand::InnerSize(dims));
ui.send_viewport_cmd(ViewportCommand::InnerSize(dims));
}
}
});
@@ -374,7 +374,7 @@ impl GameWindow {
let new_proportions = display_mode.proportions();
let scale = new_proportions / old_proportions;
if scale != Vec2::new(1.0, 1.0) {
ctx.send_viewport_cmd(ViewportCommand::InnerSize(current_dims * scale));
ui.send_viewport_cmd(ViewportCommand::InnerSize(current_dims * scale));
}
self.update_config(|c| {
@@ -497,9 +497,9 @@ impl AppWindow for GameWindow {
.with_inner_size(self.config.dimensions)
}
fn show(&mut self, ctx: &Context) {
fn show(&mut self, ui: &mut Ui) {
let dimensions = {
let bounds = ctx.available_rect();
let bounds = ui.content_rect();
bounds.max - bounds.min
};
self.update_config(|c| c.dimensions = dimensions);
@@ -509,11 +509,11 @@ impl AppWindow for GameWindow {
self.toasts.add(toast);
}
}
TopBottomPanel::top("menubar")
.exact_height(22.0)
.show(ctx, |ui| {
Panel::top("menubar")
.exact_size(22.0)
.show_inside(ui, |ui| {
MenuBar::new().ui(ui, |ui| {
self.show_menu(ctx, ui);
self.show_menu(ui);
});
});
if self.color_picker.is_some() {
@@ -521,18 +521,18 @@ impl AppWindow for GameWindow {
.title_bar(false)
.resizable(false)
.anchor(Align2::CENTER_CENTER, Vec2::ZERO)
.show(ctx, |ui| {
.show(ui, |ui| {
self.show_color_picker(ui);
});
}
let frame = Frame::central_panel(&ctx.style()).fill(Color32::BLACK);
CentralPanel::default().frame(frame).show(ctx, |ui| {
let frame = Frame::central_panel(ui.style()).fill(Color32::BLACK);
CentralPanel::default().frame(frame).show_inside(ui, |ui| {
if let Some(screen) = self.screen.as_mut() {
screen.update(self.config.display_mode, self.config.colors);
ui.add(screen);
}
});
self.toasts.show(ctx);
self.toasts.show(ui);
}
fn on_init(&mut self, args: InitArgs) {
src/window/game_screen.rs
+3 -3
View File
@@ -53,8 +53,8 @@ impl GameScreen {
let render_pipeline_layout =
device.create_pipeline_layout(&wgpu::PipelineLayoutDescriptor {
label: Some("render pipeline layout"),
bind_group_layouts: &[&bind_group_layout],
push_constant_ranges: &[],
bind_group_layouts: &[Some(&bind_group_layout)],
immediate_size: 0,
});
let create_render_pipeline = |entry_point: &str| {
@@ -92,7 +92,7 @@ impl GameScreen {
mask: !0,
alpha_to_coverage_enabled: false,
},
multiview: None,
multiview_mask: None,
cache: None,
})
};
src/window/gdb.rs
+2 -2
View File
@@ -56,10 +56,10 @@ impl AppWindow for GdbServerWindow {
.with_inner_size((300.0, 200.0))
}
fn show(&mut self, ctx: &egui::Context) {
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(ctx, |ui| {
CentralPanel::default().show_inside(ui, |ui| {
ui.horizontal(|ui| {
if port_num.is_none() {
let style = ui.style_mut();
src/window/hotkeys.rs
+4 -4
View File
@@ -1,6 +1,6 @@
use egui::{
Button, CentralPanel, Context, Event, KeyboardShortcut, Label, Layout, Slider, Ui,
ViewportBuilder, ViewportId,
Button, CentralPanel, Event, KeyboardShortcut, Label, Layout, Slider, Ui, ViewportBuilder,
ViewportId,
};
use egui_extras::{Column, TableBuilder};
@@ -135,8 +135,8 @@ impl AppWindow for HotkeysWindow {
.with_inner_size((400.0, 400.0))
}
fn show(&mut self, ctx: &Context) {
CentralPanel::default().show(ctx, |ui| {
fn show(&mut self, ui: &mut Ui) {
CentralPanel::default().show_inside(ui, |ui| {
ui.horizontal(|ui| {
if ui.button("Use defaults").clicked() {
self.shortcuts.reset();
src/window/input.rs
+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),
src/window/profile.rs
+3 -3
View File
@@ -96,10 +96,10 @@ impl AppWindow for ProfileWindow {
.with_inner_size((300.0, 200.0))
}
fn show(&mut self, ctx: &egui::Context) {
fn show(&mut self, ui: &mut egui::Ui) {
let status = self.profiler.status();
let recording = matches!(status, ProfilerStatus::Recording);
CentralPanel::default().show(ctx, |ui| {
CentralPanel::default().show_inside(ui, |ui| {
ui.horizontal_wrapped(|ui| {
ui.spacing_mut().item_spacing.x = 0.0;
ui.add(
@@ -164,7 +164,7 @@ impl AppWindow for ProfileWindow {
_ => {}
}
});
self.toasts.show(ctx);
self.toasts.show(ui);
}
fn on_init(&mut self, args: InitArgs) {
src/window/terminal.rs
+3 -4
View File
@@ -1,8 +1,7 @@
use std::{collections::VecDeque, sync::mpsc};
use egui::{
Align, CentralPanel, Context, FontFamily, Label, RichText, ScrollArea, ViewportBuilder,
ViewportId,
Align, CentralPanel, FontFamily, Label, RichText, ScrollArea, Ui, ViewportBuilder, ViewportId,
};
use crate::emulator::{EmulatorClient, EmulatorCommand, SimId};
@@ -46,7 +45,7 @@ impl AppWindow for TerminalWindow {
.with_inner_size((640.0, 480.0))
}
fn show(&mut self, ctx: &Context) {
fn show(&mut self, ui: &mut Ui) {
if let Ok(text) = self.receiver.try_recv() {
let mut rest = text.as_str();
while let Some(index) = rest.find('\n') {
@@ -61,7 +60,7 @@ impl AppWindow for TerminalWindow {
}
self.lines.back_mut().unwrap().push_str(rest);
}
CentralPanel::default().show(ctx, |ui| {
CentralPanel::default().show_inside(ui, |ui| {
ScrollArea::vertical()
.stick_to_bottom(true)
.auto_shrink([false, false])
src/window/vip/bgmap.rs
+3 -3
View File
@@ -1,7 +1,7 @@
use std::sync::Arc;
use egui::{
Align, CentralPanel, Checkbox, Color32, ComboBox, Context, Image, ScrollArea, Slider, TextEdit,
Align, CentralPanel, Checkbox, Color32, ComboBox, Image, ScrollArea, Slider, TextEdit,
TextureOptions, Ui, ViewportBuilder, ViewportId,
};
use egui_extras::{Column, Size, StripBuilder, TableBuilder};
@@ -191,8 +191,8 @@ impl AppWindow for BgMapWindow {
args.ctx.add_texture_loader(self.loader.clone());
}
fn show(&mut self, ctx: &Context) {
CentralPanel::default().show(ctx, |ui| {
fn show(&mut self, ui: &mut Ui) {
CentralPanel::default().show_inside(ui, |ui| {
ui.horizontal_top(|ui| {
StripBuilder::new(ui)
.size(Size::relative(0.3).at_most(200.0))
src/window/vip/chardata.rs
+4 -4
View File
@@ -1,8 +1,8 @@
use std::{fmt::Display, sync::Arc};
use egui::{
Align, CentralPanel, Color32, ComboBox, Context, Image, ScrollArea, Slider, TextEdit,
TextureOptions, Ui, Vec2, ViewportBuilder, ViewportId,
Align, CentralPanel, Color32, ComboBox, Image, ScrollArea, Slider, TextEdit, TextureOptions,
Ui, Vec2, ViewportBuilder, ViewportId,
};
use egui_extras::{Column, Size, StripBuilder, TableBuilder};
use serde::{Deserialize, Serialize};
@@ -255,8 +255,8 @@ impl AppWindow for CharacterDataWindow {
args.ctx.add_texture_loader(self.loader.clone());
}
fn show(&mut self, ctx: &Context) {
CentralPanel::default().show(ctx, |ui| {
fn show(&mut self, ui: &mut Ui) {
CentralPanel::default().show_inside(ui, |ui| {
ui.horizontal_top(|ui| {
StripBuilder::new(ui)
.size(Size::relative(0.3).at_most(200.0))
src/window/vip/framebuffer.rs
+3 -3
View File
@@ -1,7 +1,7 @@
use std::sync::Arc;
use egui::{
Align, CentralPanel, Color32, Context, Image, ScrollArea, Slider, TextEdit, TextureOptions, Ui,
Align, CentralPanel, Color32, Image, ScrollArea, Slider, TextEdit, TextureOptions, Ui,
ViewportBuilder, ViewportId,
};
use egui_extras::{Column, Size, StripBuilder, TableBuilder};
@@ -157,8 +157,8 @@ impl AppWindow for FrameBufferWindow {
args.ctx.add_texture_loader(self.loader.clone());
}
fn show(&mut self, ctx: &Context) {
CentralPanel::default().show(ctx, |ui| {
fn show(&mut self, ui: &mut Ui) {
CentralPanel::default().show_inside(ui, |ui| {
ui.horizontal_top(|ui| {
StripBuilder::new(ui)
.size(Size::relative(0.3).at_most(200.0))
src/window/vip/object.rs
+3 -3
View File
@@ -1,7 +1,7 @@
use std::sync::Arc;
use egui::{
Align, CentralPanel, Checkbox, Color32, ComboBox, Context, Image, ScrollArea, Slider, TextEdit,
Align, CentralPanel, Checkbox, Color32, ComboBox, Image, ScrollArea, Slider, TextEdit,
TextureOptions, Ui, ViewportBuilder, ViewportId,
};
use egui_extras::{Column, Size, StripBuilder, TableBuilder};
@@ -212,8 +212,8 @@ impl AppWindow for ObjectWindow {
args.ctx.add_texture_loader(self.loader.clone());
}
fn show(&mut self, ctx: &Context) {
CentralPanel::default().show(ctx, |ui| {
fn show(&mut self, ui: &mut Ui) {
CentralPanel::default().show_inside(ui, |ui| {
ui.horizontal_top(|ui| {
StripBuilder::new(ui)
.size(Size::relative(0.3).at_most(200.0))
src/window/vip/registers.rs
+4 -4
View File
@@ -1,8 +1,8 @@
use std::sync::Arc;
use egui::{
Align, Button, CentralPanel, Checkbox, Color32, Context, Direction, Label, Layout, ScrollArea,
TextEdit, Ui, ViewportBuilder, ViewportId,
Align, Button, CentralPanel, Checkbox, Color32, Direction, Label, Layout, ScrollArea, TextEdit,
Ui, ViewportBuilder, ViewportId,
};
use egui_extras::{Column, Size, StripBuilder, TableBuilder};
@@ -644,8 +644,8 @@ impl AppWindow for RegisterWindow {
.with_inner_size((800.0, 480.0))
}
fn show(&mut self, ctx: &Context) {
CentralPanel::default().show(ctx, |ui| {
fn show(&mut self, ui: &mut Ui) {
CentralPanel::default().show_inside(ui, |ui| {
ScrollArea::vertical().show(ui, |ui| {
ui.horizontal_top(|ui| {
let width = ui.available_width();
src/window/vip/world.rs
+3 -3
View File
@@ -1,7 +1,7 @@
use std::{fmt::Display, sync::Arc};
use egui::{
Align, CentralPanel, Checkbox, Color32, ComboBox, Context, Image, ScrollArea, Slider, TextEdit,
Align, CentralPanel, Checkbox, Color32, ComboBox, Image, ScrollArea, Slider, TextEdit,
TextureOptions, Ui, ViewportBuilder, ViewportId,
};
use egui_extras::{Column, Size, StripBuilder, TableBuilder};
@@ -527,8 +527,8 @@ impl AppWindow for WorldWindow {
args.ctx.add_texture_loader(self.loader.clone());
}
fn show(&mut self, ctx: &Context) {
CentralPanel::default().show(ctx, |ui| {
fn show(&mut self, ui: &mut Ui) {
CentralPanel::default().show_inside(ui, |ui| {
ui.horizontal_top(|ui| {
StripBuilder::new(ui)
.size(Size::relative(0.3).at_most(200.0))