aboutsummaryrefslogtreecommitdiffstats
path: root/epy.py
diff options
context:
space:
mode:
authorbenadha <benawiadha@gmail.com>2021-10-25 19:45:16 +0700
committerbenadha <benawiadha@gmail.com>2021-10-25 19:45:16 +0700
commit8cf393a3caeaf23a5e2d5dc20f69ec08dc7108c3 (patch)
treee1410dd94cb20f6c8ccc39e3c62170b1e5fd6b4b /epy.py
parent026948b8b498972fa9cb041bda383c3faecf9a93 (diff)
downloadepy-8cf393a3caeaf23a5e2d5dc20f69ec08dc7108c3.tar.gz
Fixed image cursor on double spread and progress pctg in double spread
Diffstat (limited to 'epy.py')
-rwxr-xr-xepy.py21
1 files changed, 7 insertions, 14 deletions
diff --git a/epy.py b/epy.py
index ca46159..16a1f2e 100755
--- a/epy.py
+++ b/epy.py
@@ -2593,10 +2593,7 @@ class Reader:
reading_state.row,
)
if ntoc < len(toc_entries) - 1:
- if (
- reading_state.content_index
- == toc_entries[ntoc + 1].content_index
- ):
+ if reading_state.content_index == toc_entries[ntoc + 1].content_index:
try:
reading_state = dataclasses.replace(
reading_state,
@@ -2619,10 +2616,7 @@ class Reader:
reading_state.row,
)
if ntoc > 0:
- if (
- reading_state.content_index
- == toc_entries[ntoc - 1].content_index
- ):
+ if reading_state.content_index == toc_entries[ntoc - 1].content_index:
reading_state = dataclasses.replace(
reading_state,
row=toc_secid.get(toc_entries[ntoc - 1].section, 0),
@@ -2690,10 +2684,7 @@ class Reader:
k = rettock
continue
elif fllwd is not None:
- if (
- reading_state.content_index
- == toc_entries[fllwd].content_index
- ):
+ if reading_state.content_index == toc_entries[fllwd].content_index:
try:
reading_state = dataclasses.replace(
reading_state,
@@ -2813,7 +2804,9 @@ class Reader:
(
x
if idx[i] // rows == 0
- else cols - 2 - reading_state.textwidth
+ else cols
+ - DoubleSpreadPadding.RIGHT.value
+ - reading_state.textwidth
)
+ reading_state.textwidth // 2
+ len(gambar[i])
@@ -3029,7 +3022,7 @@ class Reader:
):
reading_progress = (
self.letters_count.cumulative[reading_state.content_index]
- + sum(LOCALPCTG[: reading_state.row + rows - 1])
+ + sum(LOCALPCTG[: reading_state.row + (rows * self.spread) - 1])
) / self.letters_count.all
reading_progress_str = "{}%".format(int(reading_progress * 100))
self.screen.addstr(