Minor: Add option to reject click interactions with SS when ISS is en…

…abled * Point 4 of issue #45
FranklinDM · Jun 22, 2018 · 960262c · 960262c
1 parent 11b6616
commit 960262c
Show file tree

Hide file tree

Showing 5 changed files with 17 additions and 2 deletions.
diff --git a/content/_lib.js b/content/_lib.js
@@ -472,12 +472,16 @@ function aios_setTargets() {
     var prefInfotip = false,
     ptReverse = false,
     enable_rightclick = false,
-    switchTip = true;
+    switchTip = true,
+    inv_switch = false,
+    inv_noclick = false;
     try {
         prefInfotip = AiOS_HELPER.prefBranchAiOS.getBoolPref("infotips");
         ptReverse = AiOS_HELPER.prefBranchAiOS.getBoolPref("paneltab.reverse");
         enable_rightclick = AiOS_HELPER.prefBranchAiOS.getBoolPref("rightclick");
         switchTip = AiOS_HELPER.prefBranchAiOS.getBoolPref("switchtip");
+        inv_switch = AiOS_HELPER.prefBranchAiOS.getBoolPref('gen.switch.inv');
+        inv_noclick = AiOS_HELPER.prefBranchAiOS.getBoolPref('gen.switch.invnoclick');
 
         if (prefInfotip) {
             if (AiOS_Objects.sbSwitch)
@@ -490,7 +494,8 @@ function aios_setTargets() {
             }
         }
 
-        if (!switchTip)
+        // If tooltip for the switch is disabled/it's not logical to show the tooltip, remove it
+        if (!switchTip || (inv_switch && inv_noclick))
             if (AiOS_Objects.sbSwitch)
                 AiOS_Objects.sbSwitch.removeAttribute('tooltip');
 

diff --git a/content/aios_old.js b/content/aios_old.js
@@ -674,6 +674,9 @@ var AiOS = {
      * => Called by onClick() of the switcher
      */
     controlSwitch: function (ev, which) {
+        // If the invisible sidebar switch is enabled and no click is true, reject any click interactions
+        if (AiOS_HELPER.prefBranchAiOS.getBoolPref('gen.switch.inv') && AiOS_HELPER.prefBranchAiOS.getBoolPref('gen.switch.invnoclick'))
+            return;
         // Left click => metaKey = Mac
         if (ev.button == 0 && (!ev.shiftKey && !ev.ctrlKey && !ev.metaKey)) {
             AiOS.toggleSidebar(which);

diff --git a/content/prefs/prefs.xul b/content/prefs/prefs.xul
@@ -173,6 +173,9 @@
             <preference id="SSInvMouse"
                         type="bool"
                         name="extensions.aios.gen.switch.invmouse" />
+            <preference id="SSInvNoClick"
+                        type="bool"
+                        name="extensions.aios.gen.switch.invnoclick" />
 
             <preference id="SSDrag"
                         type="bool"
@@ -631,6 +634,8 @@
                                           label="&gen.switch.invhover;" />
                                 <checkbox preference="SSInvMouse"
                                           label="&gen.switch.invmouse;" />
+                                <checkbox preference="SSInvNoClick"
+                                          label="&gen.switch.invnoclick;" />          
                             </vbox>
 
                             <grid flex="1"

diff --git a/defaults/preferences/aios.js b/defaults/preferences/aios.js
@@ -51,6 +51,7 @@ pref("extensions.aios.gen.switch.inv", false);
 pref("extensions.aios.gen.switch.invmax", false);
 pref("extensions.aios.gen.switch.invhover", true);
 pref("extensions.aios.gen.switch.invmouse", true);
+pref("extensions.aios.gen.switch.invnoclick", false);
 
 pref("extensions.aios.cmode.key", 2);
 pref("extensions.aios.cmode.switch", 2);

diff --git a/locale/en-US/prefs.dtd b/locale/en-US/prefs.dtd
@@ -51,6 +51,7 @@
 <!ENTITY gen.switch.onhover "When the mouse is above the invisible sidebar switch:">
 <!ENTITY gen.switch.invhover "Show visual feedback or highlight">
 <!ENTITY gen.switch.invmouse "Show a hand cursor">
+<!ENTITY gen.switch.invnoclick "Reject click interactions with the sidebar switch">
 <!ENTITY gen.switch.delayshow "Show Delay">
 <!ENTITY gen.switch.delayhide "Hide Delay">
 <!ENTITY gen.switch.delay "Delay">