diff --git a/client/components/Reader/SettingsPage/SettingsPage.vue b/client/components/Reader/SettingsPage/SettingsPage.vue index f6882b5e..ab68f9b9 100644 --- a/client/components/Reader/SettingsPage/SettingsPage.vue +++ b/client/components/Reader/SettingsPage/SettingsPage.vue @@ -130,6 +130,10 @@ export default @Component({ if (newValue != '' && this.pageChangeAnimation == 'flip') this.pageChangeAnimation = ''; }, + dualPageMode(newValue) { + if (newValue && this.pageChangeAnimation == 'flip' || this.pageChangeAnimation == 'rightShift') + this.pageChangeAnimation = ''; + }, textColor: function(newValue) { this.textColorFiltered = newValue; }, @@ -282,13 +286,15 @@ class SettingsPage extends Vue { let result = [ {label: 'Нет', value: ''}, {label: 'Вверх-вниз', value: 'downShift'}, - {label: 'Вправо-влево', value: 'rightShift'}, + (!this.dualPageMode ? {label: 'Вправо-влево', value: 'rightShift'} : null), {label: 'Протаивание', value: 'thaw'}, {label: 'Мерцание', value: 'blink'}, {label: 'Вращение', value: 'rotate'}, - ]; - if (this.wallpaper == '') - result.push({label: 'Листание', value: 'flip'}); + (this.wallpaper == '' && !this.dualPageMode ? {label: 'Листание', value: 'flip'} : null), + ]; + + result = result.filter(v => v); + return result; } diff --git a/client/components/Reader/TextPage/DrawHelper.js b/client/components/Reader/TextPage/DrawHelper.js index 8bd57214..66ad0efa 100644 --- a/client/components/Reader/TextPage/DrawHelper.js +++ b/client/components/Reader/TextPage/DrawHelper.js @@ -180,16 +180,7 @@ export default class DrawHelper { out += ''; //разделитель - out += `
` + - `
` + - `
` + - `
` + - `
` + - `
`; + out += `
`; //правая страница out += `
`; @@ -250,7 +241,7 @@ export default class DrawHelper { out += this.fillTextShift(this.fittingString(title, this.realWidth/2 - fontSize - 3, font), fontSize, 2, font, fontSize); - out += this.drawPercentBar(this.realWidth/2, 2, this.realWidth/2 - timeW - 2*fontSize, statusBarHeight, font, fontSize, bookPos, textLength, imageNum, imageLength); + out += this.drawPercentBar(this.realWidth/2 + fontSize, 2, this.realWidth/2 - timeW - 3*fontSize, statusBarHeight, font, fontSize, bookPos, textLength, imageNum, imageLength); out += '
'; return out; diff --git a/client/components/Reader/TextPage/TextPage.vue b/client/components/Reader/TextPage/TextPage.vue index 60c3da24..46c3f7d8 100644 --- a/client/components/Reader/TextPage/TextPage.vue +++ b/client/components/Reader/TextPage/TextPage.vue @@ -1,8 +1,8 @@