From 68af0d86c3a941e185b34926fdbc57c457466e28 Mon Sep 17 00:00:00 2001
From: toasted-nutbread <toasted-nutbread@users.noreply.github.com>
Date: Sat, 31 Aug 2019 11:51:31 -0400
Subject: Improve popup position for vertical text

---
 ext/bg/settings.html | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)

(limited to 'ext/bg/settings.html')

diff --git a/ext/bg/settings.html b/ext/bg/settings.html
index 0704140e..c6090c91 100644
--- a/ext/bg/settings.html
+++ b/ext/bg/settings.html
@@ -107,6 +107,17 @@
                     </select>
                 </div>
 
+                <div class="form-group">
+                    <label for="popup-display-mode">Popup position for vertical text</label>
+                    <select class="form-control" id="popup-vertical-text-position">
+                        <option value="default">Same as for horizontal text</option>
+                        <option value="before">Before text reading direction</option>
+                        <option value="after">After text reading direction</option>
+                        <option value="left">Left of text</option>
+                        <option value="right">Right of text</option>
+                    </select>
+                </div>
+
                 <div class="form-group options-advanced">
                     <label for="audio-playback-volume">Audio playback volume (percent)</label>
                     <input type="number" min="0" max="100" id="audio-playback-volume" class="form-control">
@@ -133,6 +144,14 @@
                     </div>
                 </div>
 
+                <div class="form-group options-advanced">
+                    <label>Popup offset for vertical text (horizontal, vertical; in pixels)</label>
+                    <div class="row">
+                        <div class="col-xs-6"><input type="number" min="0" id="popup-horizontal-offset2" class="form-control"></div>
+                        <div class="col-xs-6"><input type="number" min="0" id="popup-vertical-offset2" class="form-control"></div>
+                    </div>
+                </div>
+
                 <div class="form-group options-advanced">
                     <label for="custom-popup-css">Custom popup CSS</label>
                     <div><textarea autocomplete="off" spellcheck="false" wrap="soft" id="custom-popup-css" class="form-control"></textarea></div>
-- 
cgit v1.2.3


From 85472d9407861f688e55b06b1767882f71229fc2 Mon Sep 17 00:00:00 2001
From: toasted-nutbread <toasted-nutbread@users.noreply.github.com>
Date: Sat, 31 Aug 2019 11:56:12 -0400
Subject: Add option for position of popup for horizontal text

---
 ext/bg/js/options.js  | 1 +
 ext/bg/js/settings.js | 2 ++
 ext/bg/settings.html  | 8 ++++++++
 ext/fg/js/popup.js    | 4 +++-
 4 files changed, 14 insertions(+), 1 deletion(-)

(limited to 'ext/bg/settings.html')

diff --git a/ext/bg/js/options.js b/ext/bg/js/options.js
index c4a7e681..c76525b9 100644
--- a/ext/bg/js/options.js
+++ b/ext/bg/js/options.js
@@ -201,6 +201,7 @@ function optionsSetDefaults(options) {
             popupVerticalOffset: 10,
             popupHorizontalOffset2: 10,
             popupVerticalOffset2: 0,
+            popupHorizontalTextPosition: 'below',
             popupVerticalTextPosition: 'before',
             showGuide: true,
             compactTags: false,
diff --git a/ext/bg/js/settings.js b/ext/bg/js/settings.js
index 83a1c2f6..c4eb4842 100644
--- a/ext/bg/js/settings.js
+++ b/ext/bg/js/settings.js
@@ -32,6 +32,7 @@ async function formRead() {
     optionsNew.general.showAdvanced = $('#show-advanced-options').prop('checked');
     optionsNew.general.maxResults = parseInt($('#max-displayed-results').val(), 10);
     optionsNew.general.popupDisplayMode = $('#popup-display-mode').val();
+    optionsNew.general.popupHorizontalTextPosition = $('#popup-horizontal-text-position').val();
     optionsNew.general.popupVerticalTextPosition = $('#popup-vertical-text-position').val();
     optionsNew.general.popupWidth = parseInt($('#popup-width').val(), 10);
     optionsNew.general.popupHeight = parseInt($('#popup-height').val(), 10);
@@ -171,6 +172,7 @@ async function onReady() {
     $('#show-advanced-options').prop('checked', options.general.showAdvanced);
     $('#max-displayed-results').val(options.general.maxResults);
     $('#popup-display-mode').val(options.general.popupDisplayMode);
+    $('#popup-horizontal-text-position').val(options.general.popupHorizontalTextPosition);
     $('#popup-vertical-text-position').val(options.general.popupVerticalTextPosition);
     $('#popup-width').val(options.general.popupWidth);
     $('#popup-height').val(options.general.popupHeight);
diff --git a/ext/bg/settings.html b/ext/bg/settings.html
index c6090c91..4f244602 100644
--- a/ext/bg/settings.html
+++ b/ext/bg/settings.html
@@ -107,6 +107,14 @@
                     </select>
                 </div>
 
+                <div class="form-group">
+                    <label for="popup-display-mode">Popup position for horizontal text</label>
+                    <select class="form-control" id="popup-horizontal-text-position">
+                        <option value="below">Below text</option>
+                        <option value="above">Above text</option>
+                    </select>
+                </div>
+
                 <div class="form-group">
                     <label for="popup-display-mode">Popup position for vertical text</label>
                     <select class="form-control" id="popup-vertical-text-position">
diff --git a/ext/fg/js/popup.js b/ext/fg/js/popup.js
index 138dec41..86ce575d 100644
--- a/ext/fg/js/popup.js
+++ b/ext/fg/js/popup.js
@@ -91,13 +91,15 @@ class Popup {
             }
         }
 
+        const preferBelow = (optionsGeneral.popupHorizontalTextPosition === 'below');
+
         const verticalOffset = optionsGeneral.popupVerticalOffset;
         const [y, h, below] = Popup.limitGeometry(
             elementRect.top - verticalOffset,
             elementRect.bottom + verticalOffset,
             height,
             maxHeight,
-            true
+            preferBelow
         );
 
         return [x, y, width, h, below];
-- 
cgit v1.2.3


From 707d2569cc2c8c6da2bdacea6e999a7ea3ea6297 Mon Sep 17 00:00:00 2001
From: toasted-nutbread <toasted-nutbread@users.noreply.github.com>
Date: Sat, 31 Aug 2019 12:04:32 -0400
Subject: Group options onto the same line

---
 ext/bg/settings.html | 35 +++++++++++++++++++----------------
 1 file changed, 19 insertions(+), 16 deletions(-)

(limited to 'ext/bg/settings.html')

diff --git a/ext/bg/settings.html b/ext/bg/settings.html
index 4f244602..778dcee0 100644
--- a/ext/bg/settings.html
+++ b/ext/bg/settings.html
@@ -108,22 +108,25 @@
                 </div>
 
                 <div class="form-group">
-                    <label for="popup-display-mode">Popup position for horizontal text</label>
-                    <select class="form-control" id="popup-horizontal-text-position">
-                        <option value="below">Below text</option>
-                        <option value="above">Above text</option>
-                    </select>
-                </div>
-
-                <div class="form-group">
-                    <label for="popup-display-mode">Popup position for vertical text</label>
-                    <select class="form-control" id="popup-vertical-text-position">
-                        <option value="default">Same as for horizontal text</option>
-                        <option value="before">Before text reading direction</option>
-                        <option value="after">After text reading direction</option>
-                        <option value="left">Left of text</option>
-                        <option value="right">Right of text</option>
-                    </select>
+                    <div class="row">
+                        <div class="col-xs-6">
+                            <label for="popup-display-mode">Popup position for horizontal text</label>
+                            <select class="form-control" id="popup-horizontal-text-position">
+                                <option value="below">Below text</option>
+                                <option value="above">Above text</option>
+                            </select>
+                        </div>
+                        <div class="col-xs-6">
+                            <label for="popup-display-mode">Popup position for vertical text</label>
+                            <select class="form-control" id="popup-vertical-text-position">
+                                <option value="default">Same as for horizontal text</option>
+                                <option value="before">Before text reading direction</option>
+                                <option value="after">After text reading direction</option>
+                                <option value="left">Left of text</option>
+                                <option value="right">Right of text</option>
+                            </select>
+                        </div>
+                    </div>
                 </div>
 
                 <div class="form-group options-advanced">
-- 
cgit v1.2.3