Merge branch 'dev' of https://github.com/zen-browser/desktop into dev

mr-cheffy · mr-cheffy · commit df916f1e4a7e · 2025-06-10T20:49:32.000+02:00
diff --git a/src/browser/app/profile/features/glance.inc b/src/browser/app/profile/features/glance.inc
@@ -3,6 +3,7 @@
 // file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 pref('zen.glance.enabled', true);
+pref('zen.glance.enable-contextmenu-search', true);
 pref('zen.glance.hold-duration', 300); // in ms
 pref('zen.glance.open-essential-external-links', true);
 pref('zen.glance.activation-method', 'alt'); // ctrl, alt, shift, none, hold
diff --git a/src/zen/glance/ZenGlanceManager.mjs b/src/zen/glance/ZenGlanceManager.mjs
@@ -748,8 +748,11 @@
     }
 
     onSearchSelectCommand(where) {
-      // Check if glance is enabled in user preferences
-      if (!Services.prefs.getBoolPref('zen.glance.enabled', false)) {
+      // Check if Glance is globally enabled and specifically enabled for contextmenu/search
+      if (
+        !Services.prefs.getBoolPref('zen.glance.enabled', false) ||
+        !Services.prefs.getBoolPref('zen.glance.enable-contextmenu-search', true)
+      ) {
         return;
       }
       if (where !== 'tab') {

Original file line number	Diff line number	Diff line change
`@@ -748,8 +748,11 @@`
`748`	`748`	`}`
`749`	`749`
`750`	`750`	`onSearchSelectCommand(where) {`
`751`		`- // Check if glance is enabled in user preferences`
`752`		`- if (!Services.prefs.getBoolPref('zen.glance.enabled', false)) {`
	`751`	`+ // Check if Glance is globally enabled and specifically enabled for contextmenu/search`
	`752`	`+ if (`
	`753`	`+ !Services.prefs.getBoolPref('zen.glance.enabled', false) \|\|`
	`754`	`+ !Services.prefs.getBoolPref('zen.glance.enable-contextmenu-search', true)`
	`755`	`+ ) {`
`753`	`756`	`return;`
`754`	`757`	`}`
`755`	`758`	`if (where !== 'tab') {`