Skip to content

GNOME look, scroll bars that keep clear of text, Autorun table fix #5

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
sudo-py-dev merged 4 commits into from
Oct 29, 2026
Merged

GNOME look, scroll bars that keep clear of text, Autorun table fix #5

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
f8a68b5
GNOME look; scroll bars keep clear of the content
sudo-py-dev Oct 29, 2026
3e6c24d
Tidy: rustfmt, drop an unused icon, clear clippy warnings
sudo-py-dev Oct 29, 2026
f835a16
Autorun: the Details table keeps to its columns
sudo-py-dev Oct 29, 2026
6889e5e
Autorun: badges shrink to icons when the Program column is narrow
sudo-py-dev Oct 29, 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
34 changes: 26 additions & 8 deletions src/gui/autorun.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -353,7 +353,7 @@ impl AutorunView {
let wide = ui.available_width() >= 960.0;
let mut columns = vec![
Column::exact(56.0),
Column::remainder().at_least(240.0).clip(true),
Column::remainder().at_least(180.0).clip(true),
Column::exact(140.0).clip(true),
Column::exact(150.0).clip(true),
Column::exact(160.0).clip(true),
Expand All @@ -379,7 +379,7 @@ impl AutorunView {
body.rows(66.0, rows.len(), |mut row| {
let e = &rows[row.index()];
row.set_selected(self.focus.as_deref() == Some(&e.id));
let mut cells: Vec<Box<dyn FnOnce(&mut Ui) + '_>> = vec![
let mut cells: Vec<style::Cell> = vec![
Box::new(|ui: &mut Ui| {
let mut on = e.enabled;
ui.add_enabled_ui(e.source != Source::RunOnce, |ui| {
Expand All @@ -393,12 +393,27 @@ impl AutorunView {
ui.spacing_mut().item_spacing.y = 2.0;
ui.spacing_mut().interact_size.y = 18.0;
crate::gui::style::row(ui, |ui| {
ui.add(style::Label::new(style::strong(e.display_name()).color(if e.enabled { p.text } else { p.faint })));
if e.running {
style::badge(ui, "Running", p.success);
}
if !e.valid {
style::badge(ui, "Program missing", p.danger);
// A long name is cut short, leaving room for the badges, so the cell keeps to its column.
// When even the badges don't fit, they shrink to icons that name themselves on hover.
let gap = ui.spacing().item_spacing.x;
let marks = [(e.running, "Running", icon::CHECK_CIRCLE, p.success), (!e.valid, "Program missing", icon::WARNING, p.danger)];
let marks: Vec<_> = marks.into_iter().filter(|m| m.0).collect();
let users = if e.all_users { 14.0 + gap } else { 0.0 };
let full = marks.iter().map(|m| style::badge_width(ui, m.1) + gap).sum::<f32>() + users;
let compact = ui.available_width() - full < 100.0;
let badges = if compact { marks.len() as f32 * (16.0 + gap) + users } else { full };
ui.scope(|ui| {
ui.set_max_width((ui.available_width() - badges).max(40.0));
ui.add(style::Label::new(style::strong(e.display_name()).color(if e.enabled { p.text } else { p.faint })).truncate());
});
for (_, label, glyph, color) in marks {
if compact {
let r = ui.add(style::Label::new(style::rich(glyph).color(color).size(14.0)));
r.widget_info(|| egui::WidgetInfo::labeled(egui::Role::Label, true, tr(label)));
r.on_hover_text(style::vis(tr(label)));
} else {
style::badge(ui, label, color);
Comment thread
coderabbitai[bot] marked this conversation as resolved.
Resolved
}
}
if e.all_users {
ui.add(style::Label::new(style::rich(icon::USERS).color(p.faint).size(13.0))).on_hover_text(style::vis(tr("For all users")));
Expand All @@ -417,6 +432,9 @@ impl AutorunView {
}),
Box::new(|ui: &mut Ui| {
crate::gui::style::row(ui, |ui| {
// Three 32-point buttons fit the 120-point column only without their text padding.
ui.spacing_mut().button_padding.x = 6.0;
ui.spacing_mut().item_spacing.x = 4.0;
let tip = if e.removable { tr("Remove (backed up)") } else { tr("Can't be deleted: disable it instead") };
ui.add_enabled_ui(e.removable, |ui| {
if style::icon_button(ui, icon::TRASH, tip).clicked() {
Expand Down
2 changes: 1 addition & 1 deletion src/gui/cleaner.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -591,7 +591,7 @@ impl CleanerView {
let mut all = n_sel == idx.len();
let cb = egui::Checkbox::new(&mut all, style::vis("")).indeterminate(n_sel > 0 && n_sel < idx.len());
let r = ui.add(cb);
r.widget_info(|| egui::WidgetInfo::selected(egui::Role::CheckBox, ui.is_enabled(), all, &name));
r.widget_info(|| egui::WidgetInfo::selected(egui::Role::CheckBox, ui.is_enabled(), all, name));
if r.changed() {
idx.iter().for_each(|i| checked[*i] = all);
}
Expand Down
4 changes: 2 additions & 2 deletions src/gui/mod.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -354,7 +354,7 @@ impl App {
ui.add_space(8.0);
let rec = crate::watcher::recorder_running();
// The recorder's state, with the theme switch at its far end.
egui::Frame::new().fill(p.surface_alt).corner_radius(10).inner_margin(egui::Margin { left: 10, right: 2, top: 1, bottom: 1 }).show(ui, |ui| {
egui::Frame::new().fill(p.hover).corner_radius(10).inner_margin(egui::Margin { left: 10, right: 2, top: 1, bottom: 1 }).show(ui, |ui| {
ui.set_width(ui.available_width());
crate::gui::style::row(ui, |ui| {
ui.spacing_mut().item_spacing.x = 6.0;
Expand Down Expand Up @@ -483,7 +483,7 @@ impl eframe::App for App {
let side = if style::rtl() { egui::Panel::right("sidebar") } else { egui::Panel::left("sidebar") };
side.resizable(false)
.exact_size(236.0)
.frame(egui::Frame::new().fill(p.surface).stroke(egui::Stroke::new(1.0, p.border)).inner_margin(egui::Margin::symmetric(12, 0)))
.frame(egui::Frame::new().fill(p.sidebar).stroke(egui::Stroke::new(1.0, p.border)).inner_margin(egui::Margin::symmetric(12, 0)))
.show(ui, |ui| self.sidebar(ui));

egui::CentralPanel::default().frame(egui::Frame::new().fill(p.bg).inner_margin(egui::Margin { left: 28, right: 28, top: 22, bottom: 18 })).show(ui, |ui| {
Expand Down
27 changes: 15 additions & 12 deletions src/gui/options.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,18 +69,21 @@ impl SettingsView {
let screen = ctx.content_rect();
let size = Vec2::new((screen.width() - 64.0).clamp(520.0, 980.0), (screen.height() - 150.0).clamp(320.0, 620.0));
let mut close = false;
let frame = egui::Frame::new().fill(p.surface).stroke(egui::Stroke::new(1.0, p.border)).corner_radius(14);
let shown = egui::Modal::new(egui::Id::unique("settings-dialog")).frame(frame).show(ctx, |ui| {
let frame = egui::Frame::new().fill(p.bg).corner_radius(15).shadow(ctx.global_style().visuals.window_shadow);
let id = egui::Id::unique("settings-dialog");
let intro = style::dialog_intro(ctx, id);
let shown = egui::Modal::new(id).frame(frame).show(ctx, |ui| {
ui.multiply_opacity(intro);
ui.set_width(size.x);
ui.spacing_mut().item_spacing.y = 0.0;
// Title bar: the name in the middle, the close button at the far end.
egui::Frame::new().fill(p.bg).corner_radius(egui::CornerRadius { nw: 14, ne: 14, sw: 0, se: 0 }).show(ui, |ui| {
let (rect, _) = ui.allocate_exact_size(Vec2::new(size.x, 56.0), egui::Sense::hover());
let title = crate::tf!("{} {}", icon::GEAR, tr("Settings"));
ui.painter().text(rect.center(), egui::Align2::CENTER_CENTER, style::vstr(title), egui::FontId::new(19.0, style::semibold()), p.text);
// Header bar, as in GNOME: the title centred, a round close button at the far end.
egui::Frame::new().show(ui, |ui| {
let (rect, _) = ui.allocate_exact_size(Vec2::new(size.x, 50.0), egui::Sense::hover());
ui.painter().text(rect.center(), egui::Align2::CENTER_CENTER, style::vstr(tr("Settings")), egui::FontId::new(15.0, style::semibold()), p.text);
let m = style::Mirror::new(rect);
let x = m.rect(size.x - 52.0, rect.center().y - 16.0, Vec2::splat(32.0));
if ui.put(x, |ui: &mut Ui| style::icon_button(ui, icon::X, "Close")).clicked() {
let x = m.rect(size.x - 38.0, rect.center().y - 12.0, Vec2::splat(24.0));
if ui.put(x, |ui: &mut Ui| style::close_button(ui, "Close")).clicked() {
close = true;
}
});
Expand Down Expand Up @@ -506,10 +509,10 @@ fn category(ui: &mut Ui, s: Section, selected: bool, p: Palette) -> egui::Respon
let (rect, resp) = ui.allocate_exact_size(Vec2::new(ui.available_width(), 46.0), egui::Sense::click());
// Tabs, so assistive tools (and the translation audit) see them as one group.
resp.widget_info(|| egui::WidgetInfo::selected(egui::Role::Tab, true, selected, label));
if selected {
ui.painter().rect_filled(rect, 10.0, p.accent_soft);
} else if resp.hovered() {
ui.painter().rect_filled(rect, 10.0, p.hover);
let h = ui.ctx().animate_bool_with_time(resp.id.with("hover"), resp.hovered() && !selected, style::FADE);
let s_t = ui.ctx().animate_bool_with_time(resp.id.with("sel"), selected, style::FADE);
if s_t > 0.0 || h > 0.0 {
ui.painter().rect_filled(rect, 8.0, p.hover.gamma_multiply(h).lerp_to_gamma(p.selected, s_t));
}
let m = style::Mirror::new(rect);
let tile = m.rect(10.0, rect.center().y - 15.0, Vec2::splat(30.0));
Expand Down
Loading
Loading