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 12:59:25 +07:00
parent 7309f2f80e
commit 11be4bf0d2
2 changed files with 26 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -257,15 +257,32 @@ class TextPage extends Vue {
this.pageChangeTransitionSpeed = settings.pageChangeTransitionSpeed; //0-100%
}
async calcPropsAndLoadFonts(omitLoadFonts) {
this.calcDrawProps();
if (!omitLoadFonts)
await this.loadFonts();
//this.draw();
// шрифты хрен знает когда подгружаются, поэтому
if (!this.parsed.force) {
let i = 0;
this.parsed.force = true;
while (i < 10) {
this.draw();
await sleep(1000);
i++;
}
this.parsed.force = false;
}
}
loadSettings() {
(async() => {
let fontName = this.fontName;
this.getSettings();
this.calcDrawProps();
if (fontName != this.fontName)
await this.loadFonts();
await this.calcPropsAndLoadFonts(fontName == this.fontName);
this.draw();
})();
@@ -311,22 +328,7 @@ class TextPage extends Vue {
this.parsed = this.book.parsed;
this.calcDrawProps();
await this.loadFonts();
//this.draw();
// шрифты хрен знает когда подгружаются, поэтому
let i = 0;
this.parsed.force = true;
while (i < 10) {
this.draw();
await sleep(1000);
i++;
}
this.parsed.force = false;
this.calcPropsAndLoadFonts();
this.refreshTime();
})();
}

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

@@ -11,10 +11,10 @@ const fonts = [
];
const webFonts = [
{css: 'https://fonts.googleapis.com/css?family=Oswald', name: 'Oswald', fontVertShift: 0},
{css: 'https://fonts.googleapis.com/css?family=Oswald', name: 'Oswald', fontVertShift: -20},
{css: 'https://fonts.googleapis.com/css?family=Lobster', name: 'Lobster', fontVertShift: 0},
{css: 'https://fonts.googleapis.com/css?family=Pacifico', name: 'Pacifico', fontVertShift: 0},
{css: 'https://fonts.googleapis.com/css?family=Comfortaa', name: 'Comfortaa', fontVertShift: 0},
{css: 'https://fonts.googleapis.com/css?family=Pacifico', name: 'Pacifico', fontVertShift: -40},
{css: 'https://fonts.googleapis.com/css?family=Comfortaa', name: 'Comfortaa', fontVertShift: 10},
];