From 68cfdedc45e215af182d6aa12d3b29e6b7119be7 Mon Sep 17 00:00:00 2001 From: mauro-balades Date: Tue, 24 Sep 2024 16:47:52 +0200 Subject: [PATCH] Update subproject commit in l10n and zen-components --- l10n | 2 +- src/browser/base/content/zen-components | 2 +- .../base/content/zen-styles/zen-tabs/vertical-tabs.css | 2 +- src/browser/components/preferences/zen-settings.js | 10 +++++++++- 4 files changed, 12 insertions(+), 4 deletions(-) diff --git a/l10n b/l10n index f94bf3217..064e7ad35 160000 --- a/l10n +++ b/l10n @@ -1 +1 @@ -Subproject commit f94bf3217c98803655ed0cefff5d0917b92cde31 +Subproject commit 064e7ad353e70c25566bb517286e09a8e1bfdb3c diff --git a/src/browser/base/content/zen-components b/src/browser/base/content/zen-components index c65b4aef1..53b7f6eec 160000 --- a/src/browser/base/content/zen-components +++ b/src/browser/base/content/zen-components @@ -1 +1 @@ -Subproject commit c65b4aef136bc90fadab4d9e04199b6598fed3cf +Subproject commit 53b7f6eecc068a7fab3e9b62250e84cc67422143 diff --git a/src/browser/base/content/zen-styles/zen-tabs/vertical-tabs.css b/src/browser/base/content/zen-styles/zen-tabs/vertical-tabs.css index 7a4d7e1b8..4239a5113 100644 --- a/src/browser/base/content/zen-styles/zen-tabs/vertical-tabs.css +++ b/src/browser/base/content/zen-styles/zen-tabs/vertical-tabs.css @@ -275,7 +275,7 @@ #navigator-toolbox[zen-user-hover='true'][has-popup-menu], #navigator-toolbox[zen-user-hover='true']:has(*[open='true']:not(tab):not(#zen-sidepanel-button)), #navigator-toolbox[zen-expanded='true']:not([zen-user-hover='true']))) { - --zen-toolbox-max-width: 51px; + --zen-toolbox-max-width: 45px; max-width: var(--zen-toolbox-max-width) !important; min-width: calc(var(--zen-toolbox-max-width) + var(--zen-toolbox-padding) / 2 + 2px) !important; diff --git a/src/browser/components/preferences/zen-settings.js b/src/browser/components/preferences/zen-settings.js index ecb070bfd..21c95ca6f 100644 --- a/src/browser/components/preferences/zen-settings.js +++ b/src/browser/components/preferences/zen-settings.js @@ -777,7 +777,15 @@ var gZenCKSSettings = { event.preventDefault(); let input = document.querySelector(`.${ZEN_CKS_INPUT_FIELD_CLASS}[${KEYBIND_ATTRIBUTE_KEY}="${this._currentAction}"]`); - const modifiers = new KeyShortcutModifiers(event.ctrlKey, event.altKey, event.shiftKey, event.metaKey); + let accelKey = false; + let controlKey = false; + if (AppConstants.platform === 'macosx') { + accelKey = event.metaKey; + controlKey = event.ctrlKey; + } else { + accelKey = event.ctrlKey; + } + const modifiers = new KeyShortcutModifiers(controlKey, event.altKey, event.shiftKey, event.metaKey, accelKey); const modifiersActive = modifiers.areAnyActive(); let shortcut = event.key;