Skip to content

feat: add keyboard navigation support for accessibility #169

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
ptr1337 wants to merge 1 commit into
base: develop
Choose a base branch
from
Open

feat: add keyboard navigation support for accessibility #169

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
31 changes: 30 additions & 1 deletion src/window.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ use gtk::prelude::*;

use gtk::gdk_pixbuf::Pixbuf;
use gtk::glib::GString;
use gtk::{glib, Builder, HeaderBar, Window};
use gtk::{gdk, glib, Builder, HeaderBar, Window};
use tracing::{debug, error};
use unic_langid::LanguageIdentifier;

Expand Down Expand Up @@ -61,6 +61,26 @@ impl HelloWindow {
let icon_path = format!("{RESPREFIX}/data/img/{name}.png");
let image: gtk::Image = builder.object(name.as_str()).unwrap();
image.set_from_resource(Some(&icon_path));

// Enable keyboard activation (Enter/Space) for social EventBoxes
btn.connect_key_press_event(|widget, event| {
let keyval = event.keyval();
if keyval == gdk::keys::constants::Return
|| keyval == gdk::keys::constants::KP_Enter
|| keyval == gdk::keys::constants::space
{
let name = widget.widget_name();
let hello_window =
unsafe { crate::G_HELLO_WINDOW.as_ref().unwrap() };
let preferences = hello_window.get_preferences("urls");
if let Some(uri) = preferences[name.as_str()].as_str() {
hello_window.open_uri(uri);
}
glib::Propagation::Stop
} else {
glib::Propagation::Proceed
}
});
}

let homepage_grid: gtk::Grid = builder.object("homepage").unwrap();
Expand Down Expand Up @@ -165,6 +185,15 @@ impl HelloWindow {
// Show the UI
main_window.show();

// Set initial focus on a meaningful interactive widget
if installer::is_iso(&preferences) {
let install: gtk::Button = builder.object("install").unwrap();
install.grab_focus();
} else {
let readme: gtk::Button = builder.object("readme").unwrap();
readme.grab_focus();
}

// setup pages content
let hello_window = HelloWindow { window: main_window, builder, preferences };
hello_window.switch_locale(best_locale);
Expand Down
33 changes: 16 additions & 17 deletions ui/cachyos-hello.glade
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,8 +69,7 @@ along with cachyos-welcome. If not, see <http://www.gnu.org/licenses/>.
<child>
<object class="GtkLabel" id="welcometitle">
<property name="visible">True</property>
<property name="can-focus">True</property>
<property name="has-focus">True</property>
<property name="can-focus">False</property>
<property name="label" translatable="yes">Welcome to CachyOS!</property>
<attributes>
<attribute name="weight" value="bold"/>
Expand Down Expand Up @@ -148,7 +147,7 @@ We, the CachyOS Developers, hope that you will enjoy using CachyOS as much as we
<property name="label" translatable="yes">Read me</property>
<property name="name">readme</property>
<property name="visible">True</property>
<property name="can-focus">False</property>
<property name="can-focus">True</property>
<property name="receives-default">True</property>
<signal name="clicked" handler="on_btn_clicked" swapped="no"/>
</object>
Expand All @@ -162,7 +161,7 @@ We, the CachyOS Developers, hope that you will enjoy using CachyOS as much as we
<property name="label" translatable="yes">Release info</property>
<property name="name">release</property>
<property name="visible">True</property>
<property name="can-focus">False</property>
<property name="can-focus">True</property>
<property name="receives-default">True</property>
<property name="always-show-image">True</property>
<signal name="clicked" handler="on_btn_clicked" swapped="no"/>
Expand All @@ -177,7 +176,7 @@ We, the CachyOS Developers, hope that you will enjoy using CachyOS as much as we
<property name="label" translatable="yes">Wiki</property>
<property name="name">wiki</property>
<property name="visible">True</property>
<property name="can-focus">False</property>
<property name="can-focus">True</property>
<property name="receives-default">True</property>
<property name="tooltip-text" translatable="yes">Web resource</property>
<property name="image-position">right</property>
Expand All @@ -194,7 +193,7 @@ We, the CachyOS Developers, hope that you will enjoy using CachyOS as much as we
<property name="label" translatable="yes">Get involved</property>
<property name="name">involved</property>
<property name="visible">True</property>
<property name="can-focus">False</property>
<property name="can-focus">True</property>
<property name="receives-default">True</property>
<signal name="clicked" handler="on_btn_clicked" swapped="no"/>
</object>
Expand All @@ -208,7 +207,7 @@ We, the CachyOS Developers, hope that you will enjoy using CachyOS as much as we
<property name="label" translatable="yes">Forums</property>
<property name="name">forum</property>
<property name="visible">True</property>
<property name="can-focus">False</property>
<property name="can-focus">True</property>
<property name="receives-default">True</property>
<property name="tooltip-text" translatable="yes">Web resource</property>
<property name="image-position">right</property>
Expand All @@ -225,7 +224,7 @@ We, the CachyOS Developers, hope that you will enjoy using CachyOS as much as we
<property name="label" translatable="yes">Software</property>
<property name="name">software</property>
<property name="visible">True</property>
<property name="can-focus">False</property>
<property name="can-focus">True</property>
<property name="receives-default">True</property>
<property name="tooltip-text" translatable="yes">Web resource</property>
<property name="image-position">right</property>
Expand All @@ -242,7 +241,7 @@ We, the CachyOS Developers, hope that you will enjoy using CachyOS as much as we
<property name="label" translatable="yes">Development</property>
<property name="name">development</property>
<property name="visible">True</property>
<property name="can-focus">False</property>
<property name="can-focus">True</property>
<property name="receives-default">True</property>
<property name="tooltip-text" translatable="yes">Web resource</property>
<property name="image-position">right</property>
Expand All @@ -259,7 +258,7 @@ We, the CachyOS Developers, hope that you will enjoy using CachyOS as much as we
<property name="label" translatable="yes">Donate</property>
<property name="name">donate</property>
<property name="visible">True</property>
<property name="can-focus">False</property>
<property name="can-focus">True</property>
<property name="receives-default">True</property>
<property name="tooltip-text" translatable="yes">Web resource</property>
<property name="image-position">right</property>
Expand All @@ -281,7 +280,7 @@ We, the CachyOS Developers, hope that you will enjoy using CachyOS as much as we
<child>
<object class="GtkComboBoxText" id="languages">
<property name="visible">True</property>
<property name="can-focus">False</property>
<property name="can-focus">True</property>
<items>
<item id="en">English</item>
<!-- Keep en first -->
Expand Down Expand Up @@ -371,7 +370,7 @@ We, the CachyOS Developers, hope that you will enjoy using CachyOS as much as we
<object class="GtkButton" id="install">
<property name="label" translatable="yes">Launch installer</property>
<property name="name">install</property>
<property name="can-focus">False</property>
<property name="can-focus">True</property>
<property name="receives-default">True</property>
<signal name="clicked" handler="on_action_clicked" swapped="no"/>
</object>
Expand All @@ -390,7 +389,7 @@ We, the CachyOS Developers, hope that you will enjoy using CachyOS as much as we
<object class="GtkButton" id="tweaksBrowser">
<property name="label" translatable="yes">Apps/Tweaks</property>
<property name="name">tweaksBrowser</property>
<property name="can-focus">False</property>
<property name="can-focus">True</property>
<property name="receives-default">True</property>
<property name="tooltip-text" translatable="yes">Apps/Tweaks</property>
<property name="margin-left">15</property>
Expand All @@ -407,7 +406,7 @@ We, the CachyOS Developers, hope that you will enjoy using CachyOS as much as we
<object class="GtkButton" id="appBrowser">
<property name="label" translatable="yes">Install Apps</property>
<property name="name">appBrowser</property>
<property name="can-focus">False</property>
<property name="can-focus">True</property>
<property name="receives-default">True</property>
<property name="tooltip-text" translatable="yes">Common application selection</property>
<property name="margin-left">15</property>
Expand Down Expand Up @@ -437,7 +436,7 @@ We, the CachyOS Developers, hope that you will enjoy using CachyOS as much as we
<object class="GtkEventBox">
<property name="name">discord</property>
<property name="visible">True</property>
<property name="can-focus">False</property>
<property name="can-focus">True</property>
<signal name="button-press-event" handler="on_link1_clicked" swapped="no"/>
<child>
<object class="GtkImage" id="discord">
Expand All @@ -457,7 +456,7 @@ We, the CachyOS Developers, hope that you will enjoy using CachyOS as much as we
<object class="GtkEventBox">
<property name="name">reddit</property>
<property name="visible">True</property>
<property name="can-focus">False</property>
<property name="can-focus">True</property>
<signal name="button-press-event" handler="on_link1_clicked" swapped="no"/>
<child>
<object class="GtkImage" id="reddit">
Expand Down Expand Up @@ -520,7 +519,7 @@ We, the CachyOS Developers, hope that you will enjoy using CachyOS as much as we
<object class="GtkButton" id="about">
<property name="name">about</property>
<property name="visible">True</property>
<property name="can-focus">False</property>
<property name="can-focus">True</property>
<property name="receives-default">True</property>
<property name="tooltip-text" translatable="yes">About</property>
<property name="image">abouticon</property>
Expand Down
26 changes: 26 additions & 0 deletions ui/style.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,32 @@ window {
border-radius: 5px 5px 5px 5px;
}

/* Focus indicators for keyboard navigation */
button:focus {
outline: 2px solid @theme_selected_bg_color;
outline-offset: 2px;
}

combobox button:focus {
outline: 2px solid @theme_selected_bg_color;
outline-offset: 2px;
}

switch:focus {
outline: 2px solid @theme_selected_bg_color;
outline-offset: 2px;
}

checkbutton:focus {
outline: 2px solid @theme_selected_bg_color;
outline-offset: 2px;
}

eventbox:focus {
outline: 2px solid @theme_selected_bg_color;
outline-offset: 2px;
}

.aboutdialog {
border-radius: 7px;
}
Loading