Skip to content

virt: Simplify UserInterface struct #231

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
robin-nitrokey merged 2 commits into from
Jun 8, 2026
Merged

virt: Simplify UserInterface struct #231

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
11d548a
virt: Simplify UserIterface::set_inner signature
robin-nitrokey Jun 8, 2026
72e8e5e
virt: Make default user presence level configurable
robin-nitrokey Jun 8, 2026
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
12 changes: 9 additions & 3 deletions src/virt/ui.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,19 +3,25 @@ use std::time::{Duration, Instant};

pub struct UserInterface {
start_time: Instant,
user_presence_level: Level,
inner: Option<Box<dyn platform::UserInterface + Sync + Send>>,
}

impl UserInterface {
pub fn new() -> Self {
Self {
start_time: Instant::now(),
user_presence_level: Level::Normal,
inner: None,
}
}

pub fn set_inner(&mut self, inner: impl Into<Box<dyn platform::UserInterface + Sync + Send>>) {
self.inner = Some(inner.into());
pub fn set_user_presence_level(&mut self, level: Level) {
self.user_presence_level = level;
}

pub fn set_inner(&mut self, inner: Box<dyn platform::UserInterface + Sync + Send>) {
self.inner = Some(inner);
}

pub fn take_inner(&mut self) -> Option<Box<dyn platform::UserInterface + Sync + Send>> {
Expand All @@ -34,7 +40,7 @@ impl platform::UserInterface for UserInterface {
self.inner
.as_mut()
.map(|inner| inner.check_user_presence())
.unwrap_or(Level::Normal)
.unwrap_or(self.user_presence_level)
}

fn set_status(&mut self, status: Status) {
Expand Down
Loading