From 85559dafdb853e34c167a2407b84b9d8321b08d2 Mon Sep 17 00:00:00 2001
From: Book Pauk <bookpauk@gmail.com>
Date: Tue, 29 Jan 2019 23:41:20 +0700
Subject: [PATCH] =?UTF-8?q?=D0=94=D0=BE=D0=B1=D0=B0=D0=B2=D0=B8=D0=BB=20?=
 =?UTF-8?q?=D0=BF=D0=B0=D1=80=D0=B0=D0=BC=D0=B5=D1=82=D1=80=20textVertShif?=
 =?UTF-8?q?t=20=D0=B2=20=D0=BD=D0=B0=D1=81=D1=82=D1=80=D0=BE=D0=B9=D0=BA?=
 =?UTF-8?q?=D0=B8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/Reader/SettingsPage/SettingsPage.vue  | 12 +++++++++++-
 client/components/Reader/TextPage/TextPage.vue       |  3 ++-
 client/store/modules/reader.js                       |  1 +
 3 files changed, 14 insertions(+), 2 deletions(-)

diff --git a/client/components/Reader/SettingsPage/SettingsPage.vue b/client/components/Reader/SettingsPage/SettingsPage.vue
index 46c8675c..fc271daf 100644
--- a/client/components/Reader/SettingsPage/SettingsPage.vue
+++ b/client/components/Reader/SettingsPage/SettingsPage.vue
@@ -65,7 +65,7 @@
                                             <template slot="content">
                                                 Сдвиг шрифта по вертикали в процентах от размера.<br>
                                                 Отрицательное значение сдвигает вверх, положительное -<br>
-                                                вниз
+                                                вниз. Значение зависит от метрики шрифта.
                                             </template>
                                             <el-input-number v-model="vertShift" :min="-100" :max="100"></el-input-number>
                                         </el-tooltip>
@@ -111,6 +111,16 @@
                                     </el-tooltip>
                                 </el-col>
                             </el-form-item>
+                            <el-form-item label="Сдвиг">
+                                        <el-tooltip :open-delay="500" effect="light">
+                                            <template slot="content">
+                                                Сдвиг текста по вертикали в процентах от размера шрифта.<br>
+                                                Отрицательное значение сдвигает вверх, положительное -<br>
+                                                вниз. Менять, как правило, не требуется.
+                                            </template>
+                                            <el-input-number v-model="textVertShift" :min="-100" :max="100"></el-input-number>
+                                        </el-tooltip>
+                            </el-form-item>
                             <el-form-item label="Выравнивание">
                                 <el-checkbox v-model="textAlignJustify">По ширине</el-checkbox>
                                 <el-checkbox v-model="wordWrap">Перенос по слогам</el-checkbox>
diff --git a/client/components/Reader/TextPage/TextPage.vue b/client/components/Reader/TextPage/TextPage.vue
index 540f5c53..b82406b1 100644
--- a/client/components/Reader/TextPage/TextPage.vue
+++ b/client/components/Reader/TextPage/TextPage.vue
@@ -170,6 +170,7 @@ class TextPage extends Vue {
         this.currentTransition = '';
         this.pageChangeDirectionDown = true;
         this.fontShift = this.fontVertShift/100;
+        this.textShift = this.textVertShift/100 + this.fontShift;
 
         //drawHelper
         this.drawHelper.realWidth = this.realWidth;
@@ -430,7 +431,7 @@ class TextPage extends Vue {
 
         const spaceWidth = this.measureText(' ', {});
 
-        let y = this.indentTB + (this.h - this.pageLineCount*this.lineHeight + this.lineInterval)/2 + this.fontSize*this.fontShift;
+        let y = this.indentTB + (this.h - this.pageLineCount*this.lineHeight + this.lineInterval)/2 + this.fontSize*this.textShift;
         if (this.showStatusBar)
             y += this.statusBarHeight*(this.statusBarTop ? 1 : 0);
 
diff --git a/client/store/modules/reader.js b/client/store/modules/reader.js
index 4b37ff3f..5786b6c9 100644
--- a/client/store/modules/reader.js
+++ b/client/store/modules/reader.js
@@ -27,6 +27,7 @@ const settingDefaults = {
         fontName: 'ReaderDefault',
         webFontName: '',
         fontVertShift: 0,
+        textVertShift: -20,
 
         lineInterval: 3,// px, межстрочный интервал
         textAlignJustify: true,// выравнивание по ширине