Skip to content

armgit / gecko

Public Imported from GitHub
0

A GameCube/Wii emulator and debugger written in Rust.

fix debugger controls

Laylecf4e89bfcc27
diff --git a/crates/debugger/src/debugger.rs b/crates/debugger/src/debugger.rs
index e5ed426..aeab261 100644
--- a/crates/debugger/src/debugger.rs
+++ b/crates/debugger/src/debugger.rs
@@ -17,6 +17,7 @@ pub struct DebuggerUi {
pub show_controls: bool,
pub memory_base: u32,
pub memory_addr_input: String,
+ pub run_until_addr_input: String,
}
impl Default for DebuggerUi {
@@ -31,6 +32,7 @@ impl Default for DebuggerUi {
show_irqs: false,
memory_base: 0x8000_0000,
memory_addr_input: "80000000".to_string(),
+ run_until_addr_input: String::new(),
}
}
}
diff --git a/crates/debugger/src/render.rs b/crates/debugger/src/render.rs
index 7480c01..fefc0b8 100644
--- a/crates/debugger/src/render.rs
+++ b/crates/debugger/src/render.rs
@@ -272,7 +272,12 @@ impl RenderState {
windows::cpu::show_cpu(&ctx, &mut debugger_ui.show_cpu, cpu, mmio);
}
if debugger_ui.show_controls {
- windows::controls::show_controls(&ctx, &mut debugger_ui.show_controls, &mut debugger_ui.emulator_state);
+ windows::controls::show_controls(
+ &ctx,
+ &mut debugger_ui.show_controls,
+ &mut debugger_ui.emulator_state,
+ &mut debugger_ui.run_until_addr_input,
+ );
}
if debugger_ui.show_gx_state {
windows::gx::show_gx(&ctx, &mut debugger_ui.show_gx_state, gx, mmio);
diff --git a/crates/debugger/src/windows/controls.rs b/crates/debugger/src/windows/controls.rs
index 5aaef65..9782472 100644
--- a/crates/debugger/src/windows/controls.rs
+++ b/crates/debugger/src/windows/controls.rs
@@ -3,7 +3,7 @@ use egui_material_icons::icons;
use crate::debugger::EmulatorState;
-pub fn show_controls(ctx: &Context, open: &mut bool, state: &mut EmulatorState) {
+pub fn show_controls(ctx: &Context, open: &mut bool, state: &mut EmulatorState, run_until_addr_input: &mut String) {
egui::Window::new("Controls")
.open(open)
.resizable(false)
@@ -56,18 +56,16 @@ pub fn show_controls(ctx: &Context, open: &mut bool, state: &mut EmulatorState)
ui.separator();
ui.horizontal(|ui| {
- let mut run_until_addr_input = "";
- let resp = ui.add_enabled(
- is_paused,
- egui::TextEdit::singleline(&mut run_until_addr_input)
- .hint_text("address")
- .desired_width(80.0)
- .font(egui::TextStyle::Monospace),
- );
- let go = ui
- .add_enabled(is_paused, egui::Button::new(format!("{} Run", icons::ICON_PLAY_ARROW)))
- .clicked();
- if go || (resp.lost_focus() && ui.input(|i| i.key_pressed(egui::Key::Enter))) {
+ egui::TextEdit::singleline(run_until_addr_input)
+ .hint_text("address")
+ .desired_width(80.0)
+ .font(egui::TextStyle::Monospace)
+ .show(ui);
+
+ if ui
+ .add(egui::Button::new(format!("{} Run", icons::ICON_PLAY_ARROW)))
+ .clicked()
+ {
let s = run_until_addr_input.trim().trim_start_matches("0x");
if let Ok(addr) = u32::from_str_radix(s, 16) {
*state = EmulatorState::RunUntilAddress(addr);