Skip to content

allow duplicate key combos and group successive duplicates #28

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

Open
ynejmidev wants to merge 2 commits into
base: main
Choose a base branch
from
Open

allow duplicate key combos and group successive duplicates #28

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
19f583b
remove return when found existing current combo
May 8, 2026
52c8640
add count logic (eg. `^ + S x 74`)
May 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
45 changes: 33 additions & 12 deletions src/ui/display.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,8 @@ const LOGO_SVG: &[u8] = include_bytes!("../assets/logo-symbolic.svg");
struct DisplayedKey {
keys: Vec<Key>,

count: usize,

last_active: Instant,

is_held: bool,
Expand Down Expand Up @@ -121,16 +123,6 @@ impl KeyDisplayWidget {
}

let current_combo = self.get_current_combo(key.key);
if let Some(existing) = self
.displayed_keys
.iter_mut()
.find(|dk| dk.keys == current_combo)
{
existing.last_active = Instant::now();
existing.is_held = true;
existing.widget.remove_css_class("fading");
return;
}

self.remove_expired();

Expand All @@ -140,12 +132,26 @@ impl KeyDisplayWidget {
}
}

let widget = self.create_combo_widget(&current_combo);
let mut count: usize = 1;

if let Some(last) = self
.displayed_keys
.iter_mut()
.last()
.filter(|l| l.keys == current_combo)
{
last.count += 1;
count = last.count;
self.container.remove(&last.widget);
self.displayed_keys.pop_back();
}
let widget = self.create_combo_widget(&current_combo, count);

self.container.append(&widget);

let displayed = DisplayedKey {
keys: current_combo,
count,
last_active: Instant::now(),
is_held: true,
widget,
Expand All @@ -168,7 +174,7 @@ impl KeyDisplayWidget {
combo
}

fn create_combo_widget(&self, keys: &[Key]) -> Widget {
fn create_combo_widget(&self, keys: &[Key], count: usize) -> Widget {
let key_box = GtkBox::builder()
.orientation(Orientation::Horizontal)
.spacing(6)
Expand Down Expand Up @@ -208,6 +214,21 @@ impl KeyDisplayWidget {
}
}

if count > 1 {
let sep = Label::new(Some("x"));
sep.add_css_class("combo-separator");
sep.set_halign(gtk4::Align::Center);
key_box.append(&sep);

let label = Label::builder()
.label(&count.to_string())
.halign(gtk4::Align::Center)
.valign(gtk4::Align::Center)
.hexpand(true)
.build();
key_box.append(&label);
}

key_box.upcast()
}

Expand Down