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-30 16:50:52 +07:00
parent cfd16d670c
commit 9ef9c5597b
1 changed files with 33 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1,13 +1,15 @@
<template> <template>
<div ref="main" class="main"> <div ref="main" class="main">
<div v-show="toggleLayout" class="layout"> <div class="background">
<div v-html="page1"></div> <div v-show="toggleLayout" class="layout">
</div> <div v-html="page1"></div>
<div v-show="!toggleLayout" class="layout"> </div>
<div v-html="page2"></div> <div v-show="!toggleLayout" class="layout">
</div> <div v-html="page2"></div>
<div v-show="showStatusBar" ref="statusBar" class="layout"> </div>
<div v-html="statusBar"></div> <div v-show="showStatusBar" ref="statusBar" class="layout">
<div v-html="statusBar"></div>
</div>
</div> </div>
<div ref="layoutEvents" class="layout events" @mousedown.prevent.stop="onMouseDown" @mouseup.prevent.stop="onMouseUp" <div ref="layoutEvents" class="layout events" @mousedown.prevent.stop="onMouseDown" @mouseup.prevent.stop="onMouseUp"
@wheel.prevent.stop="onMouseWheel" @wheel.prevent.stop="onMouseWheel"
@@ -265,18 +267,26 @@ class TextPage extends Vue {
if (!omitLoadFonts) if (!omitLoadFonts)
await this.loadFonts(); await this.loadFonts();
//this.draw(); this.setBackground();
this.page1 = null;
this.page2 = null;
this.statusBar = null;
this.draw();
// шрифты хрен знает когда подгружаются, поэтому // шрифты хрен знает когда подгружаются, поэтому
if (!this.parsed.force) { const parsed = this.parsed;
if (!parsed.force) {
let i = 0; let i = 0;
this.parsed.force = true; parsed.force = true;
while (i < 10) { while (i < 10) {
this.draw();
await sleep(1000); await sleep(1000);
if (!this.parsed)
break;
this.draw();
i++; i++;
} }
this.parsed.force = false; parsed.force = false;
} }
} }
@@ -285,8 +295,6 @@ class TextPage extends Vue {
let fontName = this.fontName; let fontName = this.fontName;
this.getSettings(); this.getSettings();
await this.calcPropsAndLoadFonts(fontName == this.fontName); await this.calcPropsAndLoadFonts(fontName == this.fontName);
this.draw();
})(); })();
} }
@@ -343,6 +351,9 @@ class TextPage extends Vue {
} }
} }
setBackground() {
}
onResize() { onResize() {
this.calcDrawProps(); this.calcDrawProps();
this.draw(); this.draw();
@@ -873,6 +884,13 @@ class TextPage extends Vue {
min-width: 200px; min-width: 200px;
} }
.background {
margin: 0;
padding: 0;
position: relative;
z-index: 5;
}
.layout { .layout {
margin: 0; margin: 0;
padding: 0; padding: 0;