From 74d0aa9031792df07330163816b2df5b9bb37249 Mon Sep 17 00:00:00 2001
From: "YUKI \"Piro\" Hiroshi" <piro.outsider.reflex@gmail.com>
Date: Wed, 14 Sep 2022 16:42:38 +0900
Subject: [PATCH] Add option UI for shiftTabsForScrollbarDistance #3195

---
 webextensions/_locales/en/messages.json         |  3 +++
 webextensions/_locales/ja/messages.json         |  3 +++
 webextensions/background/browser-action-menu.js | 14 ++++++++++++++
 webextensions/options/options.html              |  8 ++++++++
 4 files changed, 28 insertions(+)

diff --git a/webextensions/_locales/en/messages.json b/webextensions/_locales/en/messages.json
index 413a8dc01..d007c8b2f 100644
--- a/webextensions/_locales/en/messages.json
+++ b/webextensions/_locales/en/messages.json
@@ -354,6 +354,9 @@
   "config_animation_label": { "message": "Enable animation effects" },
   "config_animationForce_label": { "message": "Enable animations regardless \"reduce animations\" platform settings" },
   "config_showCollapsedDescendantsByTooltip_label": { "message": "Show collapsed descendants in the tooltip on a tab" },
+  "config_shiftTabsForScrollbarDistance_label_before": { "message": "Shift tabs aside " },
+  "config_shiftTabsForScrollbarDistance_label_after": { "message": " to keep in-tab buttons touchable avoiding covered with the auto-shown scrollbar" },
+  "config_shiftTabsForScrollbarOnlyOnHover_label": { "message": "Shift tabs only when the mouse cursor is near the scrollbar" },
   "config_suppressGapFromShownOrHiddenToolbar_caption": { "message": "Suppress visual gap of the sidebar contents produced by temporarily shown/hidden toolbars on following cases" },
   "config_suppressGapFromShownOrHiddenToolbarOnFullScreen_label": { "message": "Fullscreen windows" },
   "config_suppressGapFromShownOrHiddenToolbarOnNewTab_label": { "message": "Blank new tabs on Firefox 85 and later" },
diff --git a/webextensions/_locales/ja/messages.json b/webextensions/_locales/ja/messages.json
index ddca5c7db..7d59a3f66 100644
--- a/webextensions/_locales/ja/messages.json
+++ b/webextensions/_locales/ja/messages.json
@@ -350,6 +350,9 @@
   "config_animation_label": { "message": "アニメーション効果を有効にする" },
   "config_animationForce_label": { "message": "アニメーションを抑制するプラットフォームの設定を無視して有効にする" },
   "config_showCollapsedDescendantsByTooltip_label": { "message": "タブのツールチップに折りたたまれた子孫タブの情報を含める" },
+  "config_shiftTabsForScrollbarDistance_label_before": { "message": "自動的に表示されるスクロールバーに覆われてタブ内のボタンに触れなくならないよう、" },
+  "config_shiftTabsForScrollbarDistance_label_after": { "message": "ぶんだけタブをずらして表示する" },
+  "config_shiftTabsForScrollbarOnlyOnHover_label": { "message": "スクロールバーにマウスカーソルが近付いた時だけタブをずらす" },
   "config_suppressGapFromShownOrHiddenToolbar_caption": { "message": "以下の場面でツールバーの表示・非表示が一時的に切り替わった場合に、サイドバーの内容をずらして視覚的なガタつきを抑制する" },
   "config_suppressGapFromShownOrHiddenToolbarOnFullScreen_label": { "message": "フルスクリーンモードのウィンドウ" },
   "config_suppressGapFromShownOrHiddenToolbarOnNewTab_label": { "message": "Firefox 85以降での新しい空のタブ" },
diff --git a/webextensions/background/browser-action-menu.js b/webextensions/background/browser-action-menu.js
index 171920001..9ac705b7f 100644
--- a/webextensions/background/browser-action-menu.js
+++ b/webextensions/background/browser-action-menu.js
@@ -131,6 +131,20 @@ const mItems = [
         type:  'checkbox',
         expert: true
       },
+      {
+        dynamicTitle: true,
+        get title() {
+          return browser.i18n.getMessage('config_shiftTabsForScrollbarDistance_label_before') + configs.shiftTabsForScrollbarDistance + browser.i18n.getMessage('config_shiftTabsForScrollbarDistance_label_after')
+        },
+        enabled: false,
+        expert:  true
+      },
+      {
+        title: indent() + browser.i18n.getMessage('config_shiftTabsForScrollbarOnlyOnHover_label'),
+        key:   'shiftTabsForScrollbarOnlyOnHover',
+        type:  'checkbox',
+        expert: true
+      },
       {
         title:   browser.i18n.getMessage('config_suppressGapFromShownOrHiddenToolbar_caption'),
         enabled: false,
diff --git a/webextensions/options/options.html b/webextensions/options/options.html
index cc0ed8279..8211e07d0 100644
--- a/webextensions/options/options.html
+++ b/webextensions/options/options.html
@@ -119,6 +119,14 @@ <h1>__MSG_config_appearance_caption__</h1>
              ><input id="showCollapsedDescendantsByTooltip"
                      type="checkbox">
              __MSG_config_showCollapsedDescendantsByTooltip_label__</label></p>
+    <p><label>__MSG_config_shiftTabsForScrollbarDistance_label_before__
+       <input id="shiftTabsForScrollbarDistance"
+              size="5">
+       __MSG_config_shiftTabsForScrollbarDistance_label_after__</label></p>
+    <p class="sub"><label class="has-checkbox"
+                         ><input id="shiftTabsForScrollbarOnlyOnHover"
+                                 type="checkbox">
+                         __MSG_config_shiftTabsForScrollbarOnlyOnHover_label__</label></p>
     <fieldset>
       <legend>__MSG_config_suppressGapFromShownOrHiddenToolbar_caption__</legend>
       <p><label class="has-checkbox"