deadcxap/liberama
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Доработки позиционирования

Browse Source
This commit is contained in:
Book Pauk
2019-01-28 05:24:11 +07:00
parent 05894d456b
commit 99fb7c0ac6
3 changed files with 10 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
client/components/Reader/Reader.vue
View File

@@ -18,7 +18,7 @@
<el-button ref="fullScreen" class="tool-button" :class="buttonActiveClass('fullScreen')" @click="buttonClick('fullScreen')"><i class="el-icon-rank"></i></el-button> <el-button ref="fullScreen" class="tool-button" :class="buttonActiveClass('fullScreen')" @click="buttonClick('fullScreen')"><i class="el-icon-rank"></i></el-button>
</el-tooltip> </el-tooltip>
<el-tooltip content="Прокрутка книги" :open-delay="1000" effect="light"> <el-tooltip content="Прокрутка книги" :open-delay="1000" effect="light">
<el-button ref="setPosition" class="tool-button" @click="buttonClick('setPosition')"><i class="el-icon-d-arrow-right"></i></el-button> <el-button ref="setPosition" class="tool-button" :class="buttonActiveClass('setPosition')" @click="buttonClick('setPosition')"><i class="el-icon-d-arrow-right"></i></el-button>
</el-tooltip> </el-tooltip>
<el-tooltip content="Плавный скроллинг" :open-delay="1000" effect="light"> <el-tooltip content="Плавный скроллинг" :open-delay="1000" effect="light">
<el-button ref="scrolling" class="tool-button" @click="buttonClick('scrolling')"><i class="el-icon-sort"></i></el-button> <el-button ref="scrolling" class="tool-button" @click="buttonClick('scrolling')"><i class="el-icon-sort"></i></el-button>
@@ -434,10 +434,10 @@ class Reader extends Vue {
keyHook(event) { keyHook(event) {
if (this.$root.rootRoute == '/reader') { if (this.$root.rootRoute == '/reader') {
let handled = false; let handled = false;
if (this.historyActive) if (!handled && this.historyActive)
handled = this.$refs.historyPage.keyHook(event); handled = this.$refs.historyPage.keyHook(event);
if (this.setPositionActive) if (!handled && this.setPositionActive)
handled = this.$refs.setPositionPage.keyHook(event); handled = this.$refs.setPositionPage.keyHook(event);
if (!handled && this.$refs.page && this.$refs.page.keyHook) if (!handled && this.$refs.page && this.$refs.page.keyHook)

6
client/components/Reader/SetPositionPage/SetPositionPage.vue
View File

@@ -1,6 +1,6 @@
<template> <template>
<div ref="main" class="main" @click="close"> <div ref="main" class="main" @click="close">
<div class="clickStop" @click.stop> <div class="mainWindow" @click.stop>
<Window @close="close"> <Window @close="close">
<template slot="header"> <template slot="header">
Установить позицию Установить позицию
@@ -78,11 +78,13 @@ class SetPositionPage extends Vue {
align-items: center; align-items: center;
} }
.clickStop { .mainWindow {
width: 100%; width: 100%;
max-width: 600px; max-width: 600px;
height: 140px; height: 140px;
display: flex; display: flex;
position: relative;
top: -50px;
} }
.slider { .slider {

3
client/components/Reader/TextPage/TextPage.vue
View File

@@ -360,6 +360,9 @@ class TextPage extends Vue {
this.pagePrepared = false; this.pagePrepared = false;
this.debouncedPrepareNextPage(); this.debouncedPrepareNextPage();
this.debouncedDrawStatusBar(); this.debouncedDrawStatusBar();
if (this.book && this.linesDown && this.linesDown.length < this.pageLineCount)
this.doEnd();
} }
drawPage(bookPos, nextChangeLines) { drawPage(bookPos, nextChangeLines) {