From 481e1e840e80f225a3539250fafb1a3d610f5576 Mon Sep 17 00:00:00 2001
From: Book Pauk <bookpauk@gmail.com>
Date: Fri, 16 Dec 2022 18:14:08 +0700
Subject: [PATCH] =?UTF-8?q?=D0=94=D0=BE=D0=B1=D0=B0=D0=B2=D0=BB=D0=B5?=
 =?UTF-8?q?=D0=BD=20=D0=BF=D0=B5=D1=80=D0=B5=D1=85=D0=BE=D0=B4=20=D0=B2=20?=
 =?UTF-8?q?=D0=BF=D0=BE=D0=BB=D0=BD=D0=BE=D1=8D=D0=BA=D1=80=D0=B0=D0=BD?=
 =?UTF-8?q?=D0=BD=D0=B9=20=D1=80=D0=B5=D0=B6=D0=B8=D0=BC=20=D0=BF=D0=BE=20?=
 =?UTF-8?q?=D0=B4=D0=B2=D0=BE=D0=B9=D0=BD=D0=BE=D0=BC=D1=83=20=D1=82=D0=B0?=
 =?UTF-8?q?=D0=BF=D1=83=20=D0=B2=20=D1=81=D0=B5=D1=80=D0=B5=D0=B4=D0=B8?=
 =?UTF-8?q?=D0=BD=D1=83=20=D1=8D=D0=BA=D1=80=D0=B0=D0=BD=D0=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 client/components/Reader/Reader.vue            |  3 +--
 client/components/Reader/TextPage/TextPage.vue | 17 ++++++++++++++++-
 2 files changed, 17 insertions(+), 3 deletions(-)

diff --git a/client/components/Reader/Reader.vue b/client/components/Reader/Reader.vue
index 1d2c1bbb..4003eb57 100644
--- a/client/components/Reader/Reader.vue
+++ b/client/components/Reader/Reader.vue
@@ -839,8 +839,7 @@ class Reader {
     }
 
     fullScreenToggle() {
-        this.fullScreenActive = !this.fullScreenActive;
-        if (this.fullScreenActive) {
+        if (!this.$q.fullscreen.isActive) {
             this.$q.fullscreen.request();
         } else {
             this.$q.fullscreen.exit();
diff --git a/client/components/Reader/TextPage/TextPage.vue b/client/components/Reader/TextPage/TextPage.vue
index ad1a3a40..8f461ad7 100644
--- a/client/components/Reader/TextPage/TextPage.vue
+++ b/client/components/Reader/TextPage/TextPage.vue
@@ -1137,7 +1137,22 @@ class TextPage {
                     //движение вправо
                     this.doScrollingSpeedUp();
                 } else if (Math.abs(dy) < touchDelta && Math.abs(dx) < touchDelta) {
-                    this.doToolBarToggle(event);
+                    if (this.clickAction === 'tb' || this.clickAction === 'fs') {
+                        this.clickAction = 'fs';
+                        return;
+                    }
+
+                    (async() => {
+                        this.clickAction = 'tb';
+                        let i = 20;
+                        while (i-- > 0 && this.clickAction === 'tb')
+                            await utils.sleep(10);
+                        if (this.clickAction === 'tb')
+                            this.doToolBarToggle();
+                        else
+                            this.doFullScreenToggle();
+                        this.clickAction = '';
+                    })();
                 }
 
                 this.startTouch = null;