Make paused recording obvious
This commit is contained in:
@@ -70,7 +70,7 @@ Each bounded iteration must:
|
||||
GTK/X11/package build, 2026-09-12); compositor behavior remains live desktop
|
||||
evidence.
|
||||
- [x] Preserve search query and surviving selection after refresh-triggering actions (17 core tests and Docker GTK/X11 build, 2026-09-10).
|
||||
- [ ] Keep keyboard pause state synchronized with button and status text.
|
||||
- [x] Make paused recording unmistakable: switch Pause/Resume button label and styling, add PAUSED to the window title, and show a standard pause overlay on the tray icon; keyboard and button transitions stay synchronized (27 X11-feature tests and Docker GTK/X11/package build, 2026-09-12); live tray/theme acceptance remains pending.
|
||||
- [ ] Implement complete keyboard-first navigation and commands.
|
||||
- [x] Make Escape hide the popup from the keyboard controller (24 X11-feature
|
||||
tests and Docker GTK/X11/package build, 2026-09-12); live GUI acceptance is
|
||||
|
||||
87
src/gui.rs
87
src/gui.rs
@@ -88,7 +88,8 @@ pub fn run(
|
||||
None
|
||||
}
|
||||
};
|
||||
let tray = match crate::tray::start() {
|
||||
let recording_state = Arc::new(AtomicBool::new(true));
|
||||
let tray = match crate::tray::start(Arc::clone(&recording_state)) {
|
||||
Ok(tray) => Some(tray),
|
||||
Err(error) => {
|
||||
tracing::warn!(%error, "system tray icon is unavailable; popup and global shortcut remain available");
|
||||
@@ -115,6 +116,7 @@ pub fn run(
|
||||
}));
|
||||
let startup_config = config.clone();
|
||||
let startup_state = Rc::clone(&shared);
|
||||
let startup_tray = tray.clone();
|
||||
let _instance = instance;
|
||||
let _tray = tray;
|
||||
application.connect_activate(move |application| {
|
||||
@@ -123,6 +125,7 @@ pub fn run(
|
||||
&startup_config,
|
||||
Rc::clone(&startup_state),
|
||||
show_on_start,
|
||||
startup_tray.clone(),
|
||||
) {
|
||||
tracing::error!(%error, "failed to build popup window");
|
||||
}
|
||||
@@ -138,6 +141,7 @@ fn build_window(
|
||||
config: &Config,
|
||||
state: Rc<RefCell<UiState>>,
|
||||
show_on_start: bool,
|
||||
tray: Option<crate::tray::TrayHandle>,
|
||||
) -> Result<()> {
|
||||
let search_box = Entry::builder()
|
||||
.placeholder_text("Search clipboard…")
|
||||
@@ -197,6 +201,17 @@ fn build_window(
|
||||
.default_height(420)
|
||||
.child(&root)
|
||||
.build();
|
||||
let css = gtk4::CssProvider::new();
|
||||
css.load_from_data(
|
||||
"button.paused { background-color: #f3a6a6; color: #3d0000; font-weight: bold; }",
|
||||
);
|
||||
if let Some(display) = gtk4::gdk::Display::default() {
|
||||
gtk4::style_context_add_provider_for_display(
|
||||
&display,
|
||||
&css,
|
||||
gtk4::STYLE_PROVIDER_PRIORITY_APPLICATION,
|
||||
);
|
||||
}
|
||||
let window_for_opacity = window.clone();
|
||||
window.connect_realize(move |_| {
|
||||
crate::platform::linux::x11_window::configure(&window_for_opacity);
|
||||
@@ -214,7 +229,14 @@ fn build_window(
|
||||
crate::platform::linux::x11_window::set_active_opacity(&window_for_opacity);
|
||||
glib::ControlFlow::Continue
|
||||
});
|
||||
window.set_title(Some(&format!("Cliphoard — {}", config.global_shortcut)));
|
||||
let recording = state.borrow().recording;
|
||||
update_recording_visuals(
|
||||
&pause_button,
|
||||
&window,
|
||||
&config.global_shortcut,
|
||||
recording,
|
||||
tray.as_ref(),
|
||||
);
|
||||
pause_button.set_tooltip_text(Some("Pause/resume recording: Ctrl+Alt+R"));
|
||||
let window_for_close = window.clone();
|
||||
window.connect_close_request(move |_| {
|
||||
@@ -226,6 +248,9 @@ fn build_window(
|
||||
let pinned_limit = config.pinned_limit;
|
||||
let pause_button_for_keys = pause_button.clone();
|
||||
let status_for_keys = status.clone();
|
||||
let window_for_recording_keys = window.clone();
|
||||
let shortcut_for_recording_keys = config.global_shortcut.clone();
|
||||
let tray_for_recording_keys = tray.clone();
|
||||
|
||||
let list_for_search = list.clone();
|
||||
let state_for_search = Rc::clone(&state);
|
||||
@@ -271,12 +296,13 @@ fn build_window(
|
||||
{
|
||||
let mut state = state_for_keys.borrow_mut();
|
||||
state.recording = !state.recording;
|
||||
let pause_label = if state.recording {
|
||||
format!("{PAUSE_ICON} Pause Recording")
|
||||
} else {
|
||||
format!("{PAUSE_ICON} Resume Recording")
|
||||
};
|
||||
pause_button_for_keys.set_label(&pause_label);
|
||||
update_recording_visuals(
|
||||
&pause_button_for_keys,
|
||||
&window_for_recording_keys,
|
||||
&shortcut_for_recording_keys,
|
||||
state.recording,
|
||||
tray_for_recording_keys.as_ref(),
|
||||
);
|
||||
set_status(
|
||||
&status_for_keys,
|
||||
if state.recording {
|
||||
@@ -532,15 +558,19 @@ fn build_window(
|
||||
|
||||
let state_for_pause = Rc::clone(&state);
|
||||
let status_for_pause = status.clone();
|
||||
let window_for_recording_pause = window.clone();
|
||||
let shortcut_for_recording_pause = config.global_shortcut.clone();
|
||||
let tray_for_recording_pause = tray.clone();
|
||||
pause_button.connect_clicked(move |button| {
|
||||
let mut state = state_for_pause.borrow_mut();
|
||||
state.recording = !state.recording;
|
||||
let pause_label = if state.recording {
|
||||
format!("{PAUSE_ICON} Pause Recording")
|
||||
} else {
|
||||
format!("{PAUSE_ICON} Resume Recording")
|
||||
};
|
||||
button.set_label(&pause_label);
|
||||
update_recording_visuals(
|
||||
button,
|
||||
&window_for_recording_pause,
|
||||
&shortcut_for_recording_pause,
|
||||
state.recording,
|
||||
tray_for_recording_pause.as_ref(),
|
||||
);
|
||||
set_status(
|
||||
&status_for_pause,
|
||||
if state.recording {
|
||||
@@ -716,6 +746,35 @@ fn set_status(label: &Label, message: &str) {
|
||||
label.set_text(&format!("[{}] {message}", now()));
|
||||
}
|
||||
|
||||
fn update_recording_visuals(
|
||||
button: &Button,
|
||||
window: &ApplicationWindow,
|
||||
shortcut: &str,
|
||||
recording: bool,
|
||||
tray: Option<&crate::tray::TrayHandle>,
|
||||
) {
|
||||
let button_label = if recording {
|
||||
format!("{PAUSE_ICON} Pause Recording")
|
||||
} else {
|
||||
format!("{PAUSE_ICON} Resume Recording")
|
||||
};
|
||||
button.set_label(&button_label);
|
||||
if recording {
|
||||
button.remove_css_class("paused");
|
||||
} else {
|
||||
button.add_css_class("paused");
|
||||
}
|
||||
let title = if recording {
|
||||
format!("Cliphoard — {shortcut}")
|
||||
} else {
|
||||
format!("Cliphoard — [PAUSED] — {shortcut}")
|
||||
};
|
||||
window.set_title(Some(&title));
|
||||
if let Some(tray) = tray {
|
||||
tray.set_recording(recording);
|
||||
}
|
||||
}
|
||||
|
||||
fn refresh_list(
|
||||
list: &ListBox,
|
||||
entries: &[crate::core::Entry],
|
||||
|
||||
30
src/tray.rs
30
src/tray.rs
@@ -1,9 +1,17 @@
|
||||
use std::sync::{
|
||||
atomic::{AtomicBool, Ordering},
|
||||
Arc,
|
||||
};
|
||||
|
||||
use anyhow::{bail, Result};
|
||||
|
||||
use crate::lifecycle::InstanceGuard;
|
||||
|
||||
struct ClipbhoardTray;
|
||||
struct ClipbhoardTray {
|
||||
recording: Arc<AtomicBool>,
|
||||
}
|
||||
|
||||
#[derive(Clone)]
|
||||
pub struct TrayHandle {
|
||||
handle: ksni::Handle<ClipbhoardTray>,
|
||||
}
|
||||
@@ -27,6 +35,14 @@ impl ksni::Tray for ClipbhoardTray {
|
||||
"io.clipbhoard.Clipbhoard".into()
|
||||
}
|
||||
|
||||
fn overlay_icon_name(&self) -> String {
|
||||
if self.recording.load(Ordering::Acquire) {
|
||||
String::new()
|
||||
} else {
|
||||
"media-playback-pause".into()
|
||||
}
|
||||
}
|
||||
|
||||
fn activate(&mut self, _x: i32, _y: i32) {
|
||||
if let Err(error) = InstanceGuard::signal_show() {
|
||||
tracing::error!(%error, "failed to show popup from tray icon");
|
||||
@@ -49,11 +65,19 @@ impl ksni::Tray for ClipbhoardTray {
|
||||
}
|
||||
}
|
||||
|
||||
pub fn start() -> Result<TrayHandle> {
|
||||
impl TrayHandle {
|
||||
pub fn set_recording(&self, recording: bool) {
|
||||
self.handle.update(|tray| {
|
||||
tray.recording.store(recording, Ordering::Release);
|
||||
});
|
||||
}
|
||||
}
|
||||
|
||||
pub fn start(recording: Arc<AtomicBool>) -> Result<TrayHandle> {
|
||||
if std::env::var_os("DBUS_SESSION_BUS_ADDRESS").is_none() {
|
||||
bail!("no D-Bus session bus is available")
|
||||
}
|
||||
let service = ksni::TrayService::new(ClipbhoardTray);
|
||||
let service = ksni::TrayService::new(ClipbhoardTray { recording });
|
||||
let handle = service.handle();
|
||||
std::thread::Builder::new()
|
||||
.name("clipbhoard-tray".into())
|
||||
|
||||
Reference in New Issue
Block a user