From 99cdd1f43fa6be90be9f7a384107591b7153a08e Mon Sep 17 00:00:00 2001
From: RainLoop Team <support@rainloop.net>
Date: Wed, 8 Jun 2016 21:07:16 +0300
Subject: [PATCH] Add use_native_scrollbars setting

---
 dev/External/ko.js                                       | 9 +++++++--
 rainloop/v/0.0.0/app/libraries/RainLoop/Actions.php      | 1 +
 .../0.0.0/app/libraries/RainLoop/Config/Application.php  | 3 ++-
 3 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/dev/External/ko.js b/dev/External/ko.js
index 5c79347b8..2bc61e807 100644
--- a/dev/External/ko.js
+++ b/dev/External/ko.js
@@ -756,8 +756,13 @@
 
 	ko.bindingHandlers.nano = {
 		'init': function (oElement) {
-			var Globals = require('Common/Globals');
-			if (!Globals.bDisableNanoScroll)
+
+			var
+				Globals = require('Common/Globals'),
+				Settings = require('Storage/Settings')
+			;
+
+			if (!Globals.bDisableNanoScroll && !Settings.appSettingsGet('useNativeScrollbars'))
 			{
 				$(oElement)
 					.addClass('nano')
diff --git a/rainloop/v/0.0.0/app/libraries/RainLoop/Actions.php b/rainloop/v/0.0.0/app/libraries/RainLoop/Actions.php
index d13b296a7..8fbf44f33 100644
--- a/rainloop/v/0.0.0/app/libraries/RainLoop/Actions.php
+++ b/rainloop/v/0.0.0/app/libraries/RainLoop/Actions.php
@@ -1473,6 +1473,7 @@ class Actions
 			'materialDesign' => (bool) $oConfig->Get('labs', 'use_material_design', true),
 			'folderSpecLimit' => (int) $oConfig->Get('labs', 'folders_spec_limit', 50),
 			'faviconStatus' => (bool) $oConfig->Get('labs', 'favicon_status', true),
+			'useNativeScrollbars' => (bool) $oConfig->Get('interface', 'use_native_scrollbars', false),
 			'listPermanentFiltered' => '' !== \trim(\RainLoop\Api::Config()->Get('labs', 'imap_message_list_permanent_filter', '')),
 			'themes' => $this->GetThemes($bMobile, false),
 			'languages' => $this->GetLanguages(false),
diff --git a/rainloop/v/0.0.0/app/libraries/RainLoop/Config/Application.php b/rainloop/v/0.0.0/app/libraries/RainLoop/Config/Application.php
index 7a6772dc4..d30fa5af9 100644
--- a/rainloop/v/0.0.0/app/libraries/RainLoop/Config/Application.php
+++ b/rainloop/v/0.0.0/app/libraries/RainLoop/Config/Application.php
@@ -159,7 +159,8 @@ class Application extends \RainLoop\Config\AbstractConfig
 			),
 
 			'interface' => array(
-				'show_attachment_thumbnail' => array(true, '')
+				'show_attachment_thumbnail' => array(true, ''),
+				'use_native_scrollbars' => array(false)
 			),
 
 			'branding' => array(