From fb2cf7fcb956dade66adb3ab0c140d1b27e81608 Mon Sep 17 00:00:00 2001 From: Logan McNaughton <848146+loganmc10@users.noreply.github.com> Date: Sun, 23 Feb 2025 13:25:23 +0100 Subject: [PATCH] move UI elements around (#277) --- src/main.rs | 2 +- src/ui/gui.rs | 27 +++++++++++++++++++-------- 2 files changed, 20 insertions(+), 9 deletions(-) diff --git a/src/main.rs b/src/main.rs index f877979..fdf7fb1 100644 --- a/src/main.rs +++ b/src/main.rs @@ -170,7 +170,7 @@ async fn main() { } else { let options = eframe::NativeOptions { viewport: eframe::egui::ViewportBuilder::default() - .with_inner_size([640.0, 480.0]) + .with_inner_size([854.0, 480.0]) .with_icon( eframe::icon_data::from_png_bytes(include_bytes!("../data/gopher64.png")) .unwrap(), diff --git a/src/ui/gui.rs b/src/ui/gui.rs index 0c9b538..f5eaec5 100644 --- a/src/ui/gui.rs +++ b/src/ui/gui.rs @@ -461,13 +461,30 @@ impl eframe::App for GopherEguiApp { egui::Grid::new("controller_config").show(ui, |ui| { ui.label("Port"); ui.label("Enabled"); + ui.label("Emulate VRU"); + //ui.label("Transfer Pak"); ui.label("Profile"); ui.label("Controller"); ui.end_row(); for i in 0..4 { ui.label(format!("{}", i + 1)); - ui.checkbox(&mut self.controller_enabled[i], ""); - + ui.centered_and_justified(|ui| { + ui.checkbox(&mut self.controller_enabled[i], ""); + }); + let mut vru = false; + ui.centered_and_justified(|ui| { + if i < 3 { + ui.add_enabled(false, egui::Checkbox::new(&mut vru, "")); + } else { + ui.add_enabled(true, egui::Checkbox::new(&mut self.emulate_vru, "")); + } + }); + /* + let mut tpak: bool = false; + ui.centered_and_justified(|ui| { + ui.checkbox(&mut tpak, ""); + }); + */ egui::ComboBox::from_id_salt(format!("profile-combo-{}", i)) .selected_text(self.selected_profile[i].clone()) .show_ui(ui, |ui| { @@ -525,12 +542,6 @@ impl eframe::App for GopherEguiApp { }; ui.checkbox(&mut self.integer_scaling, "Integer Scaling"); ui.checkbox(&mut self.fullscreen, "Fullscreen (Esc closes game)"); - ui.add_space(32.0); - - ui.checkbox( - &mut self.emulate_vru, - "Emulate VRU (connects VRU to controller port 4)", - ); ui.add_space(32.0); ui.label(format!("Version: {}", env!("CARGO_PKG_VERSION")));