Cutlery/calibre
1
0
Fork 0
mirror of https://github.com/kovidgoyal/calibre.git synced 2026-01-29 07:03:30 -05:00
Code Issues Packages Projects Releases Wiki Activity

When finding book in same column pick the book with the maximum overlap

Browse Source
This commit is contained in:
Kovid Goyal 2026-01-01 10:52:17 +05:30
parent 9315f2f7ba
commit fdc15d2f3b
No known key found for this signature in database
GPG Key ID: 06BC317B515ACE7C
1 changed files with 21 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
src/calibre/gui2/library/bookshelf_view.py
View File

@ -648,6 +648,13 @@ class ShelfItem(NamedTuple):
lc.spine_height - self.reduce_height_by - lc.shelf_gap
)
def overlap_length(self, X: 'ShelfItem') -> int:
xs, xl = X.start_x, X.width
ys, yl = self.start_x, self.width
xe = xs + xl
ye = ys + yl
return max(0, min(xe, ye) - max(xs, ys))
class CaseItem:
start_y: int = 0
@ -672,6 +679,19 @@ class CaseItem:
return candidate
return None
def book_or_divider_at_region(self, region: ShelfItem, lc: LayoutConstraints) -> ShelfItem | None:
if self.items:
idx = bisect.bisect_right(self.items, region.start_x, key=attrgetter('start_x'))
if idx > 0:
candidate = self.items[idx-1]
if region.start_x < candidate.start_x + candidate.width + lc.horizontal_gap:
if idx < len(self.items):
nc = self.items[idx]
a, b = region.overlap_length(candidate), region.overlap_length(nc)
return candidate if a >= b else nc
return candidate
return None
def closest_book_to(self, idx: int) -> ShelfItem | None:
q = self.items[idx]
if not q.is_divider:
@ -1104,7 +1124,7 @@ class BookCase(QObject):
if shelf_idx < 0 or shelf_idx >= num_shelves:
return 0
target_shelf = self.items[shelf_idx * 2]
if not (target_si := target_shelf.book_or_divider_at_xpos(si.start_x, self.layout_constraints)):
if not (target_si := target_shelf.book_or_divider_at_region(si, self.layout_constraints)):
return 0
return ans.book_id if (ans := target_shelf.closest_book_to(target_si.idx)) else 0
# }}}