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

Добавил настройку clickControl

Browse Source
This commit is contained in:
Book Pauk
2019-02-14 17:10:14 +07:00
parent 0f6747f2db
commit d306f972cc
4 changed files with 13 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
client/components/Reader/HelpPage/MouseHelpPage/MouseHelpPage.vue
View File

@@ -9,6 +9,7 @@
<li><b>ПКМ</b> - показать/скрыть панель управления</li> <li><b>ПКМ</b> - показать/скрыть панель управления</li>
<li><b>СКМ</b> - вкл./выкл. плавный скроллинг текста</li> <li><b>СКМ</b> - вкл./выкл. плавный скроллинг текста</li>
</ul> </ul>
* Для управления с помощью мыши/тачпада необходимо установить галочку "Включить управление кликом" в настройках
</div> </div>
</template> </template>

5
client/components/Reader/SettingsPage/SettingsPage.vue
View File

@@ -234,6 +234,9 @@
<!---------------------------------------------------------------------------> <!--------------------------------------------------------------------------->
<el-tab-pane label="Прочее"> <el-tab-pane label="Прочее">
<el-form :model="form" size="mini" label-width="120px" @submit.native.prevent> <el-form :model="form" size="mini" label-width="120px" @submit.native.prevent>
<el-form-item label="Управление">
<el-checkbox v-model="clickControl">Включить управление кликом</el-checkbox>
</el-form-item>
<el-form-item label="Подсказка"> <el-form-item label="Подсказка">
<el-tooltip :open-delay="500" effect="light"> <el-tooltip :open-delay="500" effect="light">
<template slot="content"> <template slot="content">
@@ -241,7 +244,7 @@
</template> </template>
<el-checkbox v-model="showClickMapPage">Показывать области управления кликом</el-checkbox> <el-checkbox v-model="showClickMapPage">Показывать области управления кликом</el-checkbox>
</el-tooltip> </el-tooltip>
</el-form-item> </el-form-item>
<el-form-item label="URL"> <el-form-item label="URL">
<el-tooltip :open-delay="500" effect="light"> <el-tooltip :open-delay="500" effect="light">
<template slot="content"> <template slot="content">

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

@@ -4,18 +4,18 @@
<div v-html="background"></div> <div v-html="background"></div>
<!-- img --> <!-- img -->
</div> </div>
<div ref="scrollBox1" class="layout" style="overflow: hidden"> <div ref="scrollBox1" class="layout" style="overflow: hidden" @wheel.prevent.stop="onMouseWheel">
<div ref="scrollingPage" class="layout" @transitionend="onScrollingTransitionEnd"> <div ref="scrollingPage" class="layout" @transitionend="onScrollingTransitionEnd">
<div v-html="page1"></div> <div v-html="page1"></div>
</div> </div>
</div> </div>
<div ref="scrollBox2" class="layout" style="overflow: hidden"> <div ref="scrollBox2" class="layout" style="overflow: hidden" @wheel.prevent.stop="onMouseWheel">
<div v-html="page2"></div> <div v-html="page2"></div>
</div> </div>
<div v-show="showStatusBar" ref="statusBar" class="layout"> <div v-show="showStatusBar" ref="statusBar" class="layout">
<div v-html="statusBar"></div> <div v-html="statusBar"></div>
</div> </div>
<div ref="layoutEvents" class="layout events" @mousedown.prevent.stop="onMouseDown" @mouseup.prevent.stop="onMouseUp" <div v-show="clickControl" ref="layoutEvents" class="layout events" @mousedown.prevent.stop="onMouseDown" @mouseup.prevent.stop="onMouseUp"
@wheel.prevent.stop="onMouseWheel" @wheel.prevent.stop="onMouseWheel"
@touchstart.stop="onTouchStart" @touchend.stop="onTouchEnd" @touchcancel.prevent.stop="onTouchCancel" @touchstart.stop="onTouchStart" @touchend.stop="onTouchEnd" @touchcancel.prevent.stop="onTouchCancel"
oncontextmenu="return false;"> oncontextmenu="return false;">
@@ -23,6 +23,8 @@
@click.prevent.stop="onStatusBarClick"></div> @click.prevent.stop="onStatusBarClick"></div>
<div v-show="fontsLoading" ref="fontsLoading"></div> <div v-show="fontsLoading" ref="fontsLoading"></div>
</div> </div>
<div v-show="!clickControl && showStatusBar" class="layout" v-html="statusBarClickable" @mousedown.prevent.stop @touchstart.stop
@click.prevent.stop="onStatusBarClick"></div>
<!-- невидимым делать нельзя, вовремя не подгружаютя шрифты --> <!-- невидимым делать нельзя, вовремя не подгружаютя шрифты -->
<canvas ref="offscreenCanvas" class="layout" style="width: 0px; height: 0px"></canvas> <canvas ref="offscreenCanvas" class="layout" style="width: 0px; height: 0px"></canvas>
</div> </div>
@@ -63,6 +65,8 @@ export default @Component({
class TextPage extends Vue { class TextPage extends Vue {
toggleLayout = false; toggleLayout = false;
showStatusBar = false; showStatusBar = false;
clickControl = true;
background = null; background = null;
page1 = null; page1 = null;
page2 = null; page2 = null;

1
client/store/modules/reader.js
View File

@@ -159,6 +159,7 @@ const settingDefaults = {
lazyParseEnabled: false, lazyParseEnabled: false,
copyFullText: false, copyFullText: false,
showClickMapPage: true, showClickMapPage: true,
clickControl: true,
fontShifts: {}, fontShifts: {},
}; };