From a5740e4349a4fd55d3d40fc48f6b24df10398f66 Mon Sep 17 00:00:00 2001
From: Book Pauk <bookpauk@gmail.com>
Date: Tue, 9 Feb 2021 18:07:02 +0700
Subject: [PATCH] =?UTF-8?q?=D0=94=D0=BE=D1=80=D0=B0=D0=B1=D0=BE=D1=82?=
 =?UTF-8?q?=D0=BA=D0=B8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Reader/SettingsPage/include/ViewTab/Mode.inc      | 11 +++--------
 client/components/Reader/TextPage/TextPage.vue        |  5 ++---
 2 files changed, 5 insertions(+), 11 deletions(-)

diff --git a/client/components/Reader/SettingsPage/include/ViewTab/Mode.inc b/client/components/Reader/SettingsPage/include/ViewTab/Mode.inc
index 0f7d0d9a..4eb2a8b6 100644
--- a/client/components/Reader/SettingsPage/include/ViewTab/Mode.inc
+++ b/client/components/Reader/SettingsPage/include/ViewTab/Mode.inc
@@ -69,20 +69,15 @@
     </div>
 
     <div class="item row">
-        <div class="label-2">Заполнение</div>
+        <div class="label-2">Пунктир</div>
         <div class="col row">
             <NumInput class="col-left" v-model="dualDivStrokeFill" :min="0" :max="2000">
                 <q-tooltip :delay="1000" anchor="top middle" self="bottom middle" content-style="font-size: 80%">
                     Заполнение пунктира
                 </q-tooltip>
             </NumInput>
-        </div>
-    </div>
-
-    <div class="item row">
-        <div class="label-2">Промежуток</div>
-        <div class="col row">
-            <NumInput class="col-left" v-model="dualDivStrokeGap" :min="0" :max="2000">
+            <div class="q-px-sm"/>
+            <NumInput class="col" v-model="dualDivStrokeGap" :min="0" :max="2000">
                 <q-tooltip :delay="1000" anchor="top middle" self="bottom middle" content-style="font-size: 80%">
                     Промежуток пунктира
                 </q-tooltip>
diff --git a/client/components/Reader/TextPage/TextPage.vue b/client/components/Reader/TextPage/TextPage.vue
index 46c3f7d8..883708e7 100644
--- a/client/components/Reader/TextPage/TextPage.vue
+++ b/client/components/Reader/TextPage/TextPage.vue
@@ -790,12 +790,11 @@ class TextPage extends Vue {
         if (this.dualPageMode) {
             this.pageDivider = `<div class="layout" style="width: ${this.realWidth}px; height: ${this.scrollHeight}px; ` + 
                 `top: ${(this.showStatusBar && this.statusBarTop ? this.statusBarHeight + 1 : 0)}px; position: relative;">` +
-                `<div class="fit row justify-center items-center">` +
+                `<div class="fit row justify-center items-center no-wrap">` +
                     `<div style="height: ${Math.round(this.scrollHeight*this.dualDivHeight/100)}px; width: ${this.dualDivWidth}px; ` +
                         `box-shadow: 0 0 ${this.dualDivShadowWidth}px ${this.dualDivColor}; ` + 
                         `background-image: url(&quot;data:image/svg+xml;utf8,<svg width='100%' height='100%' xmlns='http://www.w3.org/2000/svg'>` +
-                            //`<rect width='100%' height='100%' style='fill: none; stroke: white; stroke-width: 4; stroke-dasharray: 5 20'/>` +
-                            `<line x1='0' y1='0' x2='0' y2='100%' stroke='${this.dualDivColor}' stroke-width='100%' stroke-dasharray='${this.dualDivStrokeFill} ${this.dualDivStrokeGap}'/>` +
+                            `<line x1='${this.dualDivWidth/2}' y1='0' x2='${this.dualDivWidth/2}' y2='100%' stroke='${this.dualDivColor}' stroke-width='${this.dualDivWidth}' stroke-dasharray='${this.dualDivStrokeFill} ${this.dualDivStrokeGap}'/>` +
                         `</svg>&quot;);">` +
                     `</div>` +
                 `</div>` +