Skip to content

Use built-in styles, improve screenreader #434

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
leolost2605 merged 1 commit into from
Jul 7, 2025
Merged

Use built-in styles, improve screenreader #434

Show file tree
Hide file tree
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
19 changes: 14 additions & 5 deletions data/Application.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,6 +60,7 @@ launcher progressbar progress {
min-width: 0;
}

backgrounditem,
icongroup {
padding: 6px;
padding-bottom: 0;
Expand Down Expand Up @@ -88,6 +89,19 @@ icongroup .add-image {
-gtk-icon-shadow: 0 1px 0 alpha(@highlight_color, 0.2);
}

backgrounditem header {
padding: 0.5em 1em;
}

/*Workaround for bug with headers in popover*/
backgrounditem header .heading {
margin: 0;
}

backgrounditem .close-button {
padding: 0.125em;
}

.reduce-transparency .add-image {
color: @selected_fg_color;
}
Expand All @@ -100,8 +114,3 @@ icongroup .add-image {
.running-indicator:disabled {
color: @text_color;
}

backgrounditem {
padding: 6px;
padding-bottom: 0;
}
19 changes: 8 additions & 11 deletions src/AppSystem/Background/BackgroundAppRow.vala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,13 +27,15 @@ public class Dock.BackgroundAppRow : Gtk.ListBoxRow {
hexpand = true
};
message.add_css_class (Granite.STYLE_CLASS_DIM_LABEL);
message.add_css_class (Granite.STYLE_CLASS_SMALL_LABEL);

var button = new Gtk.Button.from_icon_name ("window-close-symbolic") {
valign = CENTER,
halign = CENTER,
tooltip_text = _("End this App"),
tooltip_text = _("Quit"),
};
button.add_css_class ("circular");
button.add_css_class ("close-button");
button.add_css_class (Granite.STYLE_CLASS_CIRCULAR);
button.add_css_class (Granite.STYLE_CLASS_DESTRUCTIVE_ACTION);

var spinner = new Gtk.Spinner () {
spinning = true
Expand All @@ -47,24 +49,19 @@ public class Dock.BackgroundAppRow : Gtk.ListBoxRow {

var grid = new Gtk.Grid () {
column_spacing = 9,
row_spacing = 3,
margin_top = 3,
margin_bottom = 3,
margin_start = 9,
margin_end = 9
row_spacing = 3
};
grid.attach (icon, 0, 0, 1, 2);

if (app.message != null) {
grid.attach (name, 1, 0, 1, 1);
grid.attach (message, 1, 1, 1, 1);
grid.attach (name, 1, 0);
grid.attach (message, 1, 1);
} else {
grid.attach (name, 1, 0, 1, 2);
}

grid.attach (button_stack, 2, 0, 1, 2);

width_request = 200;
child = grid;

button.clicked.connect (() => {
Expand Down
35 changes: 8 additions & 27 deletions src/AppSystem/Background/BackgroundItem.vala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,48 +17,29 @@ public class Dock.BackgroundItem : BaseItem {
construct {
monitor = new BackgroundMonitor ();

var header_icon = new Gtk.Image.from_icon_name ("background") {
icon_size = LARGE
};

var header_label = new Gtk.Label (_("Background Apps")) {
xalign = 0,
};

var description_label = new Gtk.Label (_("These apps are running without a visible window.")) {
xalign = 0,
};
description_label.add_css_class (Granite.STYLE_CLASS_DIM_LABEL);

var header_grid = new Gtk.Grid () {
margin_start = 9,
margin_end = 9,
column_spacing = 9,
};
header_grid.attach (header_icon, 0, 0, 1, 2);
header_grid.attach (header_label, 1, 0, 1, 1);
header_grid.attach (description_label, 1, 1, 1, 1);

var placeholder = new Granite.Placeholder (_("No apps running in the background"));

var list_box = new Gtk.ListBox () {
selection_mode = NONE,
selection_mode = BROWSE
};
list_box.bind_model (monitor.background_apps, create_widget_func);
list_box.set_placeholder (placeholder);

var box = new Gtk.Box (VERTICAL, 6) {
margin_top = 12,
margin_bottom = 6,
var header_label = new Granite.HeaderLabel (_("Background Apps")) {
mnemonic_widget = list_box,
secondary_text = _("Apps running without a visible window.")
};
box.append (header_grid);

var box = new Gtk.Box (VERTICAL, 0);
box.append (header_label);
box.append (new Gtk.Separator (HORIZONTAL));
box.append (list_box);

popover = new Gtk.Popover () {
position = TOP,
child = box
};
popover.add_css_class (Granite.STYLE_CLASS_MENU);
popover.set_parent (this);

var image = new Gtk.Image.from_icon_name ("background");
Expand Down