From 8d0d74875a7ae6b7ab858c7507d2688829ba5ede Mon Sep 17 00:00:00 2001
From: Oleg Korshul <Oleg.Korshul@onlyoffice.com>
Date: Wed, 2 Oct 2024 23:43:06 +0300
Subject: [PATCH] Fix touch bugs

---
 cell/view/mobileTouch.js                 | 2 +-
 common/Scrolls/mobileTouchManagerBase.js | 4 ++--
 slide/Drawing/mobileTouchManager.js      | 4 ++--
 word/Drawing/mobileTouchManager.js       | 4 ++--
 4 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/cell/view/mobileTouch.js b/cell/view/mobileTouch.js
index 45ed65fdd8..0060928d90 100644
--- a/cell/view/mobileTouch.js
+++ b/cell/view/mobileTouch.js
@@ -530,7 +530,7 @@ function (window, undefined)
 
 		this.iScroll = new window.IScrollMobile(_element, {
 			scrollbars: true,
-			mouseWheel: true,
+			mouseWheel: !this.isDesktopMode,
 			interactiveScrollbars: true,
 			shrinkScrollbars: 'scale',
 			fadeScrollbars: true,
diff --git a/common/Scrolls/mobileTouchManagerBase.js b/common/Scrolls/mobileTouchManagerBase.js
index d6a61cfcf8..abaadc9755 100644
--- a/common/Scrolls/mobileTouchManagerBase.js
+++ b/common/Scrolls/mobileTouchManagerBase.js
@@ -1695,8 +1695,6 @@
 			ctx.fillStyle = targetElement.style.backgroundColor;
 			ctx.fill();
 			ctx.beginPath();
-
-			this.isGlassDrawed = true;
 		}
 
 		ctx.beginPath();
@@ -1709,6 +1707,8 @@
 		overlay.CheckRect(posMouseX - rad, posMouseY - glassOffset - glassSize, glassSize, glassSize);
 
 		ctx.restore();
+
+		this.isGlassDrawed = true;
 	};
 
 	// отрисовка текстового селекта
diff --git a/slide/Drawing/mobileTouchManager.js b/slide/Drawing/mobileTouchManager.js
index c967ad3b00..854413bb83 100644
--- a/slide/Drawing/mobileTouchManager.js
+++ b/slide/Drawing/mobileTouchManager.js
@@ -387,7 +387,7 @@
 
 		this.iScroll = new window.IScrollMobile(_element, {
 			scrollbars: true,
-			mouseWheel: true,
+			mouseWheel: !this.isDesktopMode,
 			interactiveScrollbars: true,
 			shrinkScrollbars: 'scale',
 			fadeScrollbars: true,
@@ -1190,7 +1190,7 @@
 
 		this.iScroll = new window.IScrollMobile(_element, {
 			scrollbars: true,
-			mouseWheel: true,
+			mouseWheel: !this.isDesktopMode,
 			interactiveScrollbars: true,
 			shrinkScrollbars: 'scale',
 			fadeScrollbars: true,
diff --git a/word/Drawing/mobileTouchManager.js b/word/Drawing/mobileTouchManager.js
index b696b3f71c..2026e96d19 100644
--- a/word/Drawing/mobileTouchManager.js
+++ b/word/Drawing/mobileTouchManager.js
@@ -62,7 +62,7 @@
 
 		this.iScroll = new window.IScrollMobile(_element, {
 			scrollbars: true,
-			mouseWheel: true,
+			mouseWheel: !this.isDesktopMode,
 			interactiveScrollbars: true,
 			shrinkScrollbars: 'scale',
 			fadeScrollbars: true,
@@ -806,7 +806,7 @@
 
 		this.iScroll = new window.IScrollMobile(this.delegate.GetScrollerParent(), {
 			scrollbars: true,
-			mouseWheel: true,
+			mouseWheel: !this.isDesktopMode,
 			interactiveScrollbars: true,
 			shrinkScrollbars: 'scale',
 			fadeScrollbars: true,