diff --git a/UI/Web/src/app/manga-reader/_components/double-renderer/double-renderer.component.scss b/UI/Web/src/app/manga-reader/_components/double-renderer/double-renderer.component.scss index 1d782acba..f2d9d0f7c 100644 --- a/UI/Web/src/app/manga-reader/_components/double-renderer/double-renderer.component.scss +++ b/UI/Web/src/app/manga-reader/_components/double-renderer/double-renderer.component.scss @@ -8,6 +8,10 @@ } } +.image-container.full-height { + display: inline-block !important; +} + .full-width { width: 100%; margin: 0 auto; diff --git a/UI/Web/src/app/manga-reader/_components/double-reverse-renderer/double-reverse-renderer.component.scss b/UI/Web/src/app/manga-reader/_components/double-reverse-renderer/double-reverse-renderer.component.scss index 537d60286..f93ef2fba 100644 --- a/UI/Web/src/app/manga-reader/_components/double-reverse-renderer/double-reverse-renderer.component.scss +++ b/UI/Web/src/app/manga-reader/_components/double-reverse-renderer/double-reverse-renderer.component.scss @@ -27,6 +27,10 @@ } } +.image-container.full-height { + display: inline-block; +} + .full-width { width: 100%; margin: 0 auto; diff --git a/UI/Web/src/app/manga-reader/_components/manga-reader/manga-reader.component.html b/UI/Web/src/app/manga-reader/_components/manga-reader/manga-reader.component.html index a5e47b77f..3dd38934e 100644 --- a/UI/Web/src/app/manga-reader/_components/manga-reader/manga-reader.component.html +++ b/UI/Web/src/app/manga-reader/_components/manga-reader/manga-reader.component.html @@ -224,7 +224,7 @@
- +
@@ -234,7 +234,7 @@
- +
diff --git a/UI/Web/src/app/manga-reader/_components/manga-reader/manga-reader.component.ts b/UI/Web/src/app/manga-reader/_components/manga-reader/manga-reader.component.ts index 38da63964..f0a7fbae7 100644 --- a/UI/Web/src/app/manga-reader/_components/manga-reader/manga-reader.component.ts +++ b/UI/Web/src/app/manga-reader/_components/manga-reader/manga-reader.component.ts @@ -147,36 +147,12 @@ export class MangaReaderComponent implements OnInit, AfterViewInit, OnDestroy { * @remarks Used for rendering to screen. */ canvasImage = new Image(); - /** - * Used solely for LayoutMode.Double rendering. - * @remarks Used for rendering to screen. - */ - canvasImage2 = new Image(); - /** - * Used solely for LayoutMode.Double rendering. Will always hold the previous image to canvasImage - * @see canvasImage - */ - canvasImagePrev = new Image(); - /** - * Used solely for LayoutMode.Double rendering. Will always hold the next image to canvasImage - * @see canvasImage - */ - canvasImageNext = new Image(); - /** - * Responsible to hold current page + 2. Used to know if we should render - * @remarks Used solely for LayoutMode.DoubleReverse rendering. - */ - canvasImageAheadBy2 = new Image(); - /** - * Responsible to hold current page -2 2. Used to know if we should render - * @remarks Used solely for LayoutMode.DoubleReverse rendering. - */ - canvasImageBehindBy2 = new Image(); + /** * Dictates if we use render with canvas or with image. * @remarks This is only for Splitting. */ - renderWithCanvas: boolean = false; + //renderWithCanvas: boolean = false; /** * A circular array of size PREFETCH_PAGES. Maintains prefetched Images around the current page to load from to avoid loading animation. @@ -468,11 +444,13 @@ export class MangaReaderComponent implements OnInit, AfterViewInit, OnDestroy { this.generalSettingsForm.get('pageSplitOption')?.setValue(this.user.preferences.pageSplitOption); this.generalSettingsForm.get('pageSplitOption')?.enable(); this.generalSettingsForm.get('fittingOption')?.enable(); + this.generalSettingsForm.get('emulateBook')?.disable(); } else { this.generalSettingsForm.get('pageSplitOption')?.setValue(PageSplitOption.NoSplit); this.generalSettingsForm.get('pageSplitOption')?.disable(); this.generalSettingsForm.get('fittingOption')?.setValue(this.mangaReaderService.translateScalingOption(ScalingOption.FitToHeight)); this.generalSettingsForm.get('fittingOption')?.disable(); + this.generalSettingsForm.get('emulateBook')?.enable(); } this.cdRef.markForCheck(); @@ -682,7 +660,6 @@ export class MangaReaderComponent implements OnInit, AfterViewInit, OnDestroy { this.pagingDirectionSubject.next(PAGING_DIRECTION.FORWARD); this.inSetup = true; this.canvasImage.src = ''; - this.canvasImage2.src = ''; this.cdRef.markForCheck(); this.cachedImages = [];