Skip to content

Commit c4b06e3

Browse files
committed
add option to disable trackpad gestures
Add a new setting to disable 'Go Back' and 'Go Forward' gestures on trackpads. Also update the settings UI and translations to support this feature. Fix for Issues: #2639, #1138
1 parent a8aa8ae commit c4b06e3

38 files changed

+62
-3
lines changed

js/webviewGestures.js

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
var webviews = require('webviews.js')
2+
var settings = require('util/settings/settings.js')
23

34
var webviewGestures = {
45
showBackArrow: function () {
@@ -87,15 +88,17 @@ function resetScrollCounters () {
8788
}
8889

8990
function onSwipeGestureLowVelocity () {
91+
const swipeGesturesDisabled = settings.get('disableSwipeGestures')
92+
9093
//we can't detect scroll position in an iframe, so never trigger a back gesture from it
91-
if (isInFrame) {
94+
if (isInFrame || swipeGesturesDisabled) {
9295
return
9396
}
9497

9598
webviews.callAsync(tabs.getSelected(), 'getZoomFactor', function(err, result) {
9699
const minScrollDistance = 150 * result;
97100

98-
if ((leftMouseMove / rightMouseMove > 5) || (rightMouseMove / leftMouseMove > 5)) {
101+
if ((leftMouseMove / rightMouseMove > 5) || (rightMouseMove / leftMouseMove > 5)) {
99102
// swipe to the left to go forward
100103
if (leftMouseMove - beginningScrollRight > minScrollDistance && Math.abs(horizontalMouseMove / verticalMouseMove) > 3) {
101104
if (beginningScrollRight < 5) {

localization/languages/ar.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -165,6 +165,7 @@
165165
"settingsLanguageSelection": null, //missing translation
166166
"settingsSeparateTitlebarToggle": "إستعمل شريط عنوان منفصل",
167167
"settingsAutoplayToggle": "تفعيل التشغيل التلقائي",
168+
"settingsDisableSwipeGestures": "تعطيل الإيماءات 'رجوع' و'تقدم' على لوحة التتبع",
168169
"settingsOpenTabsInForegroundToggle": "الإنتقال إلى التبويب الجديد عند فتحه",
169170
"settingsUserscriptsExplanation": {
170171
"unsafeHTML": "يمكن سكريبت المستخدم من تغير سلوك المواقع - <a href=\"https://github.com/minbrowser/min/wiki/userscripts\">معرفة المزيد</a>."

localization/languages/be.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -165,6 +165,7 @@
165165
"settingsLanguageSelection": null, //missing translation
166166
"settingsSeparateTitlebarToggle": "Выкарыстоўваць сістэмны загаловак акна",
167167
"settingsAutoplayToggle": "Уключыць аўтаматычнае прайграванне",
168+
"settingsDisableSwipeGestures": "Адключыць жэсты 'Назад' і 'Наперад' на трэкпадзе",
168169
"settingsOpenTabsInForegroundToggle": "Адкрываць новыя ўкладкі на пярэднім плане",
169170
"settingsUserscriptsExplanation": {
170171
"unsafeHTML": "Карыстальнiцкiя скрыпты дазваляюць змяняць паводзіны сайтаў - <a href=\"https://github.com/minbrowser/min/wiki/userscripts\">даведацца больш</a>."

localization/languages/bg.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -165,6 +165,7 @@
165165
"settingsSeparateTitlebarToggle": "Използване на отделна лента със заглавието",
166166
"settingsAutoplayToggle": null, //missing translation
167167
"settingsOpenTabsInForegroundToggle": "Отваряне на нови раздели на преден план",
168+
"settingsDisableGoBackwardAndGoForwardGestures": "Деактивиране на жестове 'Назад' и 'Напред' на тъчпада",
168169
"settingsUserscriptsExplanation": {
169170
"unsafeHTML": "Потребителските скриптове Ви позволяват да промените поведението на уеб сайтове - <a href=\"https://github.com/minbrowser/min/wiki/userscripts\">научете повече</a>."
170171
},

localization/languages/bn.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -165,6 +165,7 @@
165165
"settingsLanguageSelection": null, //missing translation
166166
"settingsSeparateTitlebarToggle": "পৃথক শিরোনাম বার ব্যবহার করুন",
167167
"settingsAutoplayToggle": null, //missing translation
168+
"settingsDisableSwipeGestures": "ট্র্যাকপ্যাডে 'পেছনে যাওয়া' এবং 'সামনে যাওয়া' নির্দেশক বন্ধ করুন",
168169
"settingsOpenTabsInForegroundToggle": "অগ্রভাগে নতুন ট্যাবগুলি খুলুন",
169170
"settingsUserscriptsExplanation": {
170171
"unsafeHTML": "ব্যবহারকারীর স্ক্রিপ্ট আপনাকে ওয়েবসাইটের আচরণ পরিবর্তন করার অনুমতি দেয় - <a href=\"https://github.com/minbrowser/min/wiki/userscripts\"> আরও শিখুন </a>"

localization/languages/ca.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -165,6 +165,7 @@
165165
"settingsLanguageSelection": null, //missing translation
166166
"settingsSeparateTitlebarToggle": "Utilitzar barra de títol separada",
167167
"settingsAutoplayToggle": "Habilitar Reproducció Automàtica",
168+
"settingsDisableSwipeGestures": "Desactiva els gestos del trackpad de 'Anar enrere' i 'Anar endavant'",
168169
"settingsOpenTabsInForegroundToggle": "Obrir noves pestanyes al primer pla",
169170
"settingsUserscriptsExplanation": {
170171
"unsafeHTML": "Els scripts d'usuari et permeten modificar el comportament dels llocs web - <a href=\"https://github.com/minbrowser/min/wiki/userscripts\">més informació</a>."

localization/languages/cs.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -165,6 +165,7 @@
165165
"settingsLanguageSelection": null, //missing translation
166166
"settingsSeparateTitlebarToggle": "Použít systémové záhlaví okna",
167167
"settingsAutoplayToggle": "Povolit automatické přehrávání",
168+
"settingsDisableSwipeGestures": "Zakázat gesta trackpadu 'Zpět' a 'Vpřed'",
168169
"settingsOpenTabsInForegroundToggle": "Ihned přepínat na nově otevřené karty",
169170
"settingsUserscriptsExplanation": {
170171
"unsafeHTML": "Uživatelské skripty umožňují upravit chování webových stránek - <a href=\"https://github.com/minbrowser/min/wiki/userscripts\">více informací</a>."

localization/languages/da.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -166,6 +166,7 @@
166166
"settingsSeparateTitlebarToggle": "Brug separat titellinje",
167167
"settingsAutoplayToggle": "Aktiver Autoplay",
168168
"settingsOpenTabsInForegroundToggle": "Åbn nye faner i forgrunden",
169+
"settingsDisableGoBackwardAndGoForwardGestures": "Deaktiver 'Gå tilbage' og 'Gå fremad' trackpad-bevægelser",
169170
"settingsUserscriptsExplanation": {
170171
"unsafeHTML": "Brugerscripts giver dig mulighed for at ændre adfærd på websteder - <a href=\"https://github.com/minbrowser/min/wiki/userscripts\">få mere at vide her</a>."
171172
},

localization/languages/de.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -165,6 +165,7 @@
165165
"settingsLanguageSelection": null, //missing translation
166166
"settingsSeparateTitlebarToggle": "Separate Titelleiste nutzen",
167167
"settingsAutoplayToggle": "Automatische Wiedergabe erlauben",
168+
"settingsDisableSwipeGestures": "Deaktivieren Sie 'Zurück' und 'Vorwärts' Trackpad-Gesten",
168169
"settingsOpenTabsInForegroundToggle": "Neue Tabs im Vordergrund öffnen",
169170
"settingsUserscriptsExplanation": {
170171
"unsafeHTML": "Benutzerdefinierte Skripte erlauben es das Verhalten von Webseiten zu modifizieren - <a href=\"https://github.com/minbrowser/min/wiki/userscripts\"> mehr dazu.</a>."

localization/languages/el.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -165,6 +165,7 @@
165165
"settingsLanguageSelection": null, //missing translation
166166
"settingsSeparateTitlebarToggle": "Χρήση ξεχωριστής γραμμής τίτλου",
167167
"settingsAutoplayToggle": "Ενεργοποίηση αυτοαναπαραγωγής",
168+
"settingsDisableGoBackwardAndGoForwardGestures": "Απενεργοποίηση χειρονομιών 'Πίσω' και 'Εμπρός' στο trackpad",
168169
"settingsOpenTabsInForegroundToggle": "Άνοιγμα νέας καρτέλας στο προσκήνιο",
169170
"settingsUserscriptsExplanation": {
170171
"unsafeHTML": "Τα scripts χρηστών σας επιτρέπουν να τροποποιήσετε την συμπεριφορά των ιστοσελίδων - <a href=\"https://github.com/minbrowser/min/wiki/userscripts\">μάθετε περισσότερα</a>."

0 commit comments

Comments
 (0)