From d4623303478b0ff3f3039deeea31ab6b23f6a571 Mon Sep 17 00:00:00 2001
From: abaevbog <bogdan@zotero.org>
Date: Thu, 3 Oct 2024 21:02:16 -0700
Subject: [PATCH] vpat 8: make window buttons not focusable (#4070)

Minimize, maximize, close, etc. window buttons are generally
not accessible for focus. They can get focused on mac with
voiceover enabled which can be confusing.

Added aria-hidden attribute to prevent voiceover from
placing the cursor on them.
---
 chrome/content/scaffold/scaffold.xhtml | 4 ++++
 chrome/content/zotero/zoteroPane.xhtml | 4 ++++
 2 files changed, 8 insertions(+)

diff --git a/chrome/content/scaffold/scaffold.xhtml b/chrome/content/scaffold/scaffold.xhtml
index 5e26552f60..e4942a6d91 100644
--- a/chrome/content/scaffold/scaffold.xhtml
+++ b/chrome/content/scaffold/scaffold.xhtml
@@ -354,21 +354,25 @@
 				titlebar-btn="min"
 				oncommand="window.minimize();"
 				data-l10n-id="browser-window-minimize-button"
+				aria-hidden="true"
 				/>
 			<toolbarbutton class="titlebar-button titlebar-max"
 				titlebar-btn="max"
 				oncommand="window.maximize();"
 				data-l10n-id="browser-window-maximize-button"
+				aria-hidden="true"
 				/>
 			<toolbarbutton class="titlebar-button titlebar-restore"
 				titlebar-btn="max"
 				oncommand="window.fullScreen ? BrowserFullScreen() : window.restore();"
 				data-l10n-id="browser-window-restore-down-button"
+				aria-hidden="true"
 				/>
 			<toolbarbutton class="titlebar-button titlebar-close"
 				titlebar-btn="close"
 				oncommand="window.close();"
 				data-l10n-id="browser-window-close-button"
+				aria-hidden="true"
 				/>
 		</hbox>
 	</vbox>
diff --git a/chrome/content/zotero/zoteroPane.xhtml b/chrome/content/zotero/zoteroPane.xhtml
index a2808516c1..cdf37e3088 100644
--- a/chrome/content/zotero/zoteroPane.xhtml
+++ b/chrome/content/zotero/zoteroPane.xhtml
@@ -818,18 +818,22 @@
 			<toolbarbutton class="titlebar-button titlebar-min"
 				oncommand="window.minimize();"
 				data-l10n-id="browser-window-minimize-button"
+				aria-hidden="true"
 				/>
 			<toolbarbutton class="titlebar-button titlebar-max"
 				oncommand="window.maximize();"
 				data-l10n-id="browser-window-maximize-button"
+				aria-hidden="true"
 				/>
 			<toolbarbutton class="titlebar-button titlebar-restore"
 				oncommand="window.fullScreen ? BrowserFullScreen() : window.restore();"
 				data-l10n-id="browser-window-restore-down-button"
+				aria-hidden="true"
 				/>
 			<toolbarbutton class="titlebar-button titlebar-close"
 				oncommand="window.close();"
 				data-l10n-id="browser-window-close-button"
+				aria-hidden="true"
 				/>
 		</hbox>
 	</vbox>