Minor QOL fixes

This commit is contained in:
ZXY101
2024-02-07 17:18:38 +02:00
parent 28155496fc
commit a1a582f786
2 changed files with 14 additions and 5 deletions

View File

@@ -21,6 +21,7 @@
import { page as pageStore } from '$app/stores'; import { page as pageStore } from '$app/stores';
import SettingsButton from './SettingsButton.svelte'; import SettingsButton from './SettingsButton.svelte';
import { getCharCount } from '$lib/util/count-chars'; import { getCharCount } from '$lib/util/count-chars';
import { afterUpdate } from 'svelte';
// TODO: Refactor this whole mess // TODO: Refactor this whole mess
export let volumeSettings: VolumeSettings; export let volumeSettings: VolumeSettings;
@@ -68,7 +69,7 @@
volume.mokuroData.volume_uuid, volume.mokuroData.volume_uuid,
pageClamped, pageClamped,
getCharCount(pages, pageClamped) || 0, getCharCount(pages, pageClamped) || 0,
pageClamped === pages.length pageClamped === pages.length || pageClamped === pages.length - 1
); );
zoomDefault(); zoomDefault();
} }
@@ -112,12 +113,12 @@
case 'ArrowLeft': case 'ArrowLeft':
case 'ArrowUp': case 'ArrowUp':
case 'PageUp': case 'PageUp':
left(event, true); changePage(page - navAmount, true);
return; return;
case 'ArrowRight': case 'ArrowRight':
case 'ArrowDown': case 'ArrowDown':
case 'PageDown': case 'PageDown':
right(event, true); changePage(page + navAmount, true);
return; return;
case 'Home': case 'Home':
changePage(1, true); changePage(1, true);
@@ -197,6 +198,10 @@
} }
} }
} }
afterUpdate(() => {
zoomDefault();
});
</script> </script>
<svelte:window <svelte:window

View File

@@ -12,8 +12,12 @@
const { volumeName, mokuroData } = volume as Volume; const { volumeName, mokuroData } = volume as Volume;
$: currentPage = $progress?.[volume?.mokuroData.volume_uuid || 0] || 1; $: currentPage = $progress?.[volume?.mokuroData.volume_uuid || 0] || 1;
$: progressDisplay = `${currentPage} / ${volume.mokuroData.pages.length}`; $: progressDisplay = `${
$: isComplete = currentPage === volume.mokuroData.pages.length; currentPage === volume.mokuroData.pages.length - 1 ? currentPage + 1 : currentPage
} / ${volume.mokuroData.pages.length}`;
$: isComplete =
currentPage === volume.mokuroData.pages.length ||
currentPage === volume.mokuroData.pages.length - 1;
</script> </script>
{#if $page.params.manga} {#if $page.params.manga}