Skip to content

Fix PSK cursor centering to ride last character #165

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

Closed
adem482p wants to merge 1 commit into from
Closed

Fix PSK cursor centering to ride last character #165

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
15 changes: 8 additions & 7 deletions src/mode/station/auth/psk.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -146,18 +146,19 @@ impl Psk {
frame.render_widget(text, text_area);
frame.render_widget(passkey, passkey_area);

let inner_width = passkey_area.width.saturating_sub(2) as usize;
let pad_left = if inner_width > pass_len {
inner_width.saturating_sub(pass_len) / 2
let pad_left = (passkey_area.width as usize / 2).saturating_sub(pass_len / 2);

let visual_cursor = self.passphrase.visual_cursor().min(pass_len);

let cursor_index = if pass_len > 0 {
visual_cursor.min(pass_len - 1)
} else {
0
};

let visual_cursor = self.passphrase.visual_cursor().min(pass_len);

let x_in_inner = pad_left + visual_cursor;
let x_in_inner = pad_left + cursor_index;

let cursor_x = passkey_area.x + 1 + x_in_inner as u16;
let cursor_x = passkey_area.x + x_in_inner as u16;
frame.set_cursor_position((cursor_x, passkey_area.y));

frame.render_widget(show_password_icon, show_password_area);
Expand Down