Skip to content

video: add a shortcut and menu item to hide the status bar #241

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
LinuxJedi merged 1 commit into from
Jul 20, 2026
Merged

video: add a shortcut and menu item to hide the status bar #241

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions docs/guide/ui.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@ The app shortcut modifier is `Cmd` on macOS and `Alt` on Linux/Windows.
| `Cmd+Shift+A` | `Alt+Shift+A` | Cycle the audio output: Default, each host device, then Disabled (also the menu's Audio Out item) |
| `Cmd+Shift++` / `Cmd+Shift+-` | `Alt+Shift++` / `Alt+Shift+-` | Raise / lower the parallel-port sampler input gain (only when a sampler is attached; also the menu's Sampler Gain item) |
| `Cmd+F` | `Alt+F` | Toggle fullscreen on / off |
| `Cmd+Shift+F` | `Alt+Shift+F` | Show / hide the status bar |
| `Cmd+W` | `Alt+W` | Toggle Warp Speed (turbo) on / off |
| `Cmd+Shift+W` | `Alt+Shift+W` | Cycle the Warp Speed limit: 2x, 4x, 8x, 16x, Max |
| `Esc` | `Esc` | Close an open menu, tool window, or overlay panel; otherwise passed through to the Amiga |
Expand Down Expand Up @@ -161,6 +162,9 @@ tool window or overlay.
window's current monitor. The picture keeps its aspect and letterboxes
as needed, exactly as when resizing the window; the same shortcut (or
menu item) restores the window.
- **Status Bar** (also `Cmd+Shift+F` / `Alt+Shift+F`): show or hide the
status bar. Handy alongside fullscreen for a clean, chrome-free picture;
the same shortcut or menu item brings it back.
- **Warp Speed** (also `Cmd+W` / `Alt+W`): runs the emulator unpaced for
fast-forward. Toggling back re-anchors real-time pacing cleanly.
- **Warp Limit** (also `Cmd+Shift+W` / `Alt+Shift+W`): cycles how fast warp
Expand Down
13 changes: 13 additions & 0 deletions src/video/mod.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -106,6 +106,19 @@ pub fn set_pixel_aspect(aspect: crate::config::PixelAspect) {
);
}

/// Whether the status bar is hidden, so the emulated display scales to fill the
/// whole window. Toggled live from the window/menu (main thread only, like
/// [`SQUARE_PIXEL_ASPECT`]); the atomic only satisfies `static` safety.
static STATUS_BAR_HIDDEN: std::sync::atomic::AtomicBool = std::sync::atomic::AtomicBool::new(false);

pub fn set_status_bar_hidden(hidden: bool) {
STATUS_BAR_HIDDEN.store(hidden, std::sync::atomic::Ordering::Relaxed);
}

pub fn status_bar_hidden() -> bool {
STATUS_BAR_HIDDEN.load(std::sync::atomic::Ordering::Relaxed)
}

pub fn pixel_aspect() -> crate::config::PixelAspect {
if SQUARE_PIXEL_ASPECT.load(std::sync::atomic::Ordering::Relaxed) {
crate::config::PixelAspect::Square
Expand Down
69 changes: 65 additions & 4 deletions src/video/ui.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -90,6 +90,7 @@ pub enum MenuItem {
PixelAspect,
FloppySpeed,
Fullscreen,
StatusBar,
AudioOutput,
Warp,
WarpLimit,
Expand All @@ -107,8 +108,8 @@ pub enum MenuItem {
pub fn menu_items(midi_active: bool, sampler_active: bool) -> Vec<MenuItem> {
let _ = midi_active;
// 9 leading + up to 2 MIDI + 2 sampler + pixel aspect + floppy speed +
// 10 trailing items = 25, sized so appending never reallocates.
let mut items = Vec::with_capacity(25);
// 11 trailing items = 26, sized so appending never reallocates.
let mut items = Vec::with_capacity(26);
Comment thread
hobbo91 marked this conversation as resolved.
items.extend([
MenuItem::MachineConfig,
MenuItem::FrameAnalyzer,
Expand All @@ -133,6 +134,7 @@ pub fn menu_items(midi_active: bool, sampler_active: bool) -> Vec<MenuItem> {
items.push(MenuItem::FloppySpeed);
items.extend([
MenuItem::Fullscreen,
MenuItem::StatusBar,
MenuItem::Warp,
MenuItem::WarpLimit,
MenuItem::Record,
Expand All @@ -153,6 +155,8 @@ pub struct MenuLabels<'a> {
pub warp_speed: WarpSpeed,
/// True while the host window is fullscreen (the menu item toggles it).
pub fullscreen: bool,
/// True while the status bar is hidden (the menu item toggles it).
pub status_bar_hidden: bool,
pub recording: bool,
pub input_recording: bool,
pub joystick_input_mode: JoystickInputMode,
Expand Down Expand Up @@ -225,6 +229,8 @@ fn menu_item_label(item: MenuItem, s: MenuLabels) -> String {
MenuItem::SamplerGain => format!("Sampler Gain {:>5}", format!("[{}]", s.sampler_gain)),
MenuItem::Fullscreen if s.fullscreen => "Fullscreen [on]".to_string(),
MenuItem::Fullscreen => "Fullscreen [off]".to_string(),
MenuItem::StatusBar if s.status_bar_hidden => "Status Bar [off]".to_string(),
MenuItem::StatusBar => "Status Bar [on]".to_string(),
MenuItem::Warp if s.warp => "Warp Speed [on]".to_string(),
MenuItem::Warp => "Warp Speed [off]".to_string(),
// Right-pad so the closing bracket stays put as the value width
Expand Down Expand Up @@ -873,7 +879,7 @@ pub enum UiControl {
fn panel_dims(panel: &Panel) -> (usize, usize) {
match panel {
Panel::About => (560, 380),
Panel::Shortcuts => (600, 464),
Panel::Shortcuts => (600, 486),
Panel::Calibration(_) => (620, 372),
Panel::Debugger(_) => (684, 520),
Panel::FrameAnalyzer(_) => (700, 526),
Expand Down Expand Up @@ -1898,7 +1904,7 @@ pub fn draw_drop_hint(frame: &mut [u8], texture_scale: usize) {
draw_panel_text(frame, x, y, text, PANEL_TEXT_HILIGHT, px, texture_scale);
}

const SHORTCUT_ROWS: [(&str, &str, bool); 17] = [
const SHORTCUT_ROWS: [(&str, &str, bool); 18] = [
("Q", "Quit", true),
("S", "Save screenshot", true),
("R", "Record video on/off", true),
Expand All @@ -1912,6 +1918,7 @@ const SHORTCUT_ROWS: [(&str, &str, bool); 17] = [
("J", "Joystick input mode", true),
("Shift+A", "Cycle audio output", true),
("F", "Fullscreen on/off", true),
("Shift+F", "Status bar on/off", true),
("W", "Warp speed on/off", true),
("Shift+W", "Warp limit (2x..Max)", true),
("Esc", "Close menu/window", false),
Expand Down Expand Up @@ -4893,6 +4900,7 @@ mod tests {
warp: false,
warp_speed: WarpSpeed::Max,
fullscreen,
status_bar_hidden: false,
recording: false,
input_recording: false,
joystick_input_mode: JoystickInputMode::Gamepad,
Expand All @@ -4918,6 +4926,40 @@ mod tests {
);
}

#[test]
fn status_bar_menu_item_label_tracks_state() {
assert!(menu_items(false, false).contains(&MenuItem::StatusBar));
let labels = |status_bar_hidden| MenuLabels {
warp: false,
warp_speed: WarpSpeed::Max,
fullscreen: false,
status_bar_hidden,
recording: false,
input_recording: false,
joystick_input_mode: JoystickInputMode::Gamepad,
port_devices: [
crate::bus::PortDevice::Mouse,
crate::bus::PortDevice::Joystick,
],
pixel_aspect: PixelAspect::Tv,
floppy_speed: 100,
midi_in: "",
midi_out: "",
audio_output: "",
sampler_input: "",
sampler_gain: "",
};
// "on" means the bar is shown.
assert_eq!(
menu_item_label(MenuItem::StatusBar, labels(false)),
"Status Bar [on]"
);
assert_eq!(
menu_item_label(MenuItem::StatusBar, labels(true)),
"Status Bar [off]"
);
}

#[test]
fn every_menu_label_fits_inside_the_popup() {
// The label is drawn at `item_rect.x + MENU_TEXT_INSET`; its glyphs
Expand All @@ -4943,6 +4985,7 @@ mod tests {
// Rides warp's sweep so both label
// states are width-checked.
fullscreen: warp,
status_bar_hidden: warp,
recording,
input_recording,
joystick_input_mode: mode,
Expand Down Expand Up @@ -5501,6 +5544,7 @@ mod tests {
warp: true,
warp_speed: WarpSpeed::Max,
fullscreen: false,
status_bar_hidden: false,
recording: false,
input_recording: false,
joystick_input_mode: JoystickInputMode::Gamepad,
Expand Down Expand Up @@ -5549,6 +5593,7 @@ mod tests {
warp: false,
warp_speed: WarpSpeed::Max,
fullscreen: false,
status_bar_hidden: false,
recording: false,
input_recording: false,
joystick_input_mode: JoystickInputMode::Gamepad,
Expand Down Expand Up @@ -5585,6 +5630,7 @@ mod tests {
warp: false,
warp_speed: WarpSpeed::Max,
fullscreen: false,
status_bar_hidden: false,
recording: false,
input_recording: false,
joystick_input_mode: JoystickInputMode::Gamepad,
Expand Down Expand Up @@ -5637,6 +5683,7 @@ mod tests {
warp: false,
warp_speed: WarpSpeed::Max,
fullscreen: false,
status_bar_hidden: false,
recording: false,
input_recording: false,
joystick_input_mode: JoystickInputMode::Gamepad,
Expand Down Expand Up @@ -5713,6 +5760,7 @@ mod tests {
warp: false,
warp_speed: WarpSpeed::Max,
fullscreen: false,
status_bar_hidden: false,
recording: false,
input_recording: false,
joystick_input_mode: JoystickInputMode::Gamepad,
Expand Down Expand Up @@ -5776,6 +5824,7 @@ mod tests {
warp: false,
warp_speed: WarpSpeed::Max,
fullscreen: false,
status_bar_hidden: false,
recording: false,
input_recording: false,
joystick_input_mode: JoystickInputMode::Gamepad,
Expand Down Expand Up @@ -5836,6 +5885,7 @@ mod tests {
warp: false,
warp_speed: WarpSpeed::Max,
fullscreen: false,
status_bar_hidden: false,
recording: false,
input_recording: false,
joystick_input_mode: JoystickInputMode::Gamepad,
Expand Down Expand Up @@ -5897,6 +5947,7 @@ mod tests {
warp: false,
warp_speed: WarpSpeed::Max,
fullscreen: false,
status_bar_hidden: false,
recording: false,
input_recording: false,
joystick_input_mode: JoystickInputMode::Gamepad,
Expand Down Expand Up @@ -6011,6 +6062,7 @@ mod tests {
warp: false,
warp_speed: WarpSpeed::Max,
fullscreen: false,
status_bar_hidden: false,
recording: false,
input_recording: false,
joystick_input_mode: JoystickInputMode::Gamepad,
Expand Down Expand Up @@ -6085,6 +6137,7 @@ mod tests {
warp: false,
warp_speed: WarpSpeed::Max,
fullscreen: false,
status_bar_hidden: false,
recording: false,
input_recording: false,
joystick_input_mode: JoystickInputMode::Gamepad,
Expand Down Expand Up @@ -6170,6 +6223,7 @@ mod tests {
warp: false,
warp_speed: WarpSpeed::Max,
fullscreen: false,
status_bar_hidden: false,
recording: false,
input_recording: false,
joystick_input_mode: JoystickInputMode::Gamepad,
Expand Down Expand Up @@ -6292,6 +6346,7 @@ mod tests {
warp: false,
warp_speed: WarpSpeed::Max,
fullscreen: false,
status_bar_hidden: false,
recording: false,
input_recording: false,
joystick_input_mode: JoystickInputMode::Gamepad,
Expand Down Expand Up @@ -6344,6 +6399,7 @@ mod tests {
warp: false,
warp_speed: WarpSpeed::Max,
fullscreen: false,
status_bar_hidden: false,
recording: false,
input_recording: false,
joystick_input_mode: JoystickInputMode::Gamepad,
Expand Down Expand Up @@ -6387,6 +6443,7 @@ mod tests {
warp: false,
warp_speed: WarpSpeed::Max,
fullscreen: false,
status_bar_hidden: false,
recording: false,
input_recording: false,
joystick_input_mode: JoystickInputMode::Gamepad,
Expand Down Expand Up @@ -6470,6 +6527,7 @@ mod tests {
warp: false,
warp_speed: WarpSpeed::Max,
fullscreen: false,
status_bar_hidden: false,
recording: false,
input_recording: false,
joystick_input_mode: JoystickInputMode::Gamepad,
Expand Down Expand Up @@ -6520,6 +6578,7 @@ mod tests {
warp: false,
warp_speed: WarpSpeed::Max,
fullscreen: false,
status_bar_hidden: false,
recording: false,
input_recording: false,
joystick_input_mode: JoystickInputMode::Gamepad,
Expand Down Expand Up @@ -6563,6 +6622,7 @@ mod tests {
warp: false,
warp_speed: WarpSpeed::Max,
fullscreen: false,
status_bar_hidden: false,
recording: false,
input_recording: false,
joystick_input_mode: JoystickInputMode::Gamepad,
Expand Down Expand Up @@ -6610,6 +6670,7 @@ mod tests {
warp: false,
warp_speed: WarpSpeed::Max,
fullscreen: false,
status_bar_hidden: false,
recording: false,
input_recording: false,
joystick_input_mode: JoystickInputMode::Gamepad,
Expand Down
Loading
Loading