Cutlery/calibre
1
0
Fork 0
mirror of https://github.com/kovidgoyal/calibre.git synced 2025-07-09 03:04:10 -04:00
Code Issues Packages Projects Releases Wiki Activity

Tabbing should move to next/previous row automatically when editing

Browse Source
This commit is contained in:
Kovid Goyal 2025-02-10 08:10:22 +05:30
parent f6167d7f0e
commit 3a64034055
No known key found for this signature in database
GPG Key ID: 06BC317B515ACE7C
1 changed files with 16 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
src/calibre/gui2/library/views.py
View File

@ -1650,7 +1650,6 @@ class BooksView(QTableView): # {{{
def closeEditor(self, editor, hint): def closeEditor(self, editor, hint):
# We want to implement our own go to next/previous cell behavior # We want to implement our own go to next/previous cell behavior
# so do it here.
orig = self.currentIndex() orig = self.currentIndex()
do_move = False do_move = False
delta = 1 delta = 1
@ -1659,9 +1658,10 @@ class BooksView(QTableView): # {{{
elif hint is QAbstractItemDelegate.EndEditHint.EditPreviousItem: elif hint is QAbstractItemDelegate.EndEditHint.EditPreviousItem:
do_move = True do_move = True
delta = -1 delta = -1
super().closeEditor(editor, QAbstractItemDelegate.EndEditHint.NoHint) super().closeEditor(editor, QAbstractItemDelegate.EndEditHint.NoHint if do_move else hint)
self.selectionModel().setCurrentIndex(orig, QItemSelectionModel.SelectionFlag.NoUpdate)
if do_move: if do_move:
# Need to invoke after event loop tick otherwise
# mirror_selection_between_views causes issues
QTimer.singleShot(0, lambda: self.edit_next_cell(orig, delta)) QTimer.singleShot(0, lambda: self.edit_next_cell(orig, delta))
def on_current_row_change(self, current, previous): def on_current_row_change(self, current, previous):
@ -1673,13 +1673,24 @@ class BooksView(QTableView): # {{{
def edit_next_cell(self, current, delta=1): def edit_next_cell(self, current, delta=1):
m = self.model() m = self.model()
idx = m.index(current.row(), current.column(), current.parent()) row = current.row()
idx = m.index(row, current.column(), current.parent())
while True: while True:
col = idx.column() + delta col = idx.column() + delta
if col < 0:
if row <= 0:
return
row -= 1
col += len(self.column_map)
if col >= len(self.column_map):
if row >= len(self.column_map) - 1:
return
row += 1
col -= len(self.column_map)
if col < 0 or col >= len(self.column_map): if col < 0 or col >= len(self.column_map):
return return
colname = self.column_map[col] colname = self.column_map[col]
idx = m.index(current.row(), col, current.parent()) idx = m.index(row, col, current.parent())
if m.is_custom_column(colname): if m.is_custom_column(colname):
if self.itemDelegateForIndex(idx).is_editable_with_tab: if self.itemDelegateForIndex(idx).is_editable_with_tab:
# Don't try to open editors implemented by dialogs such as # Don't try to open editors implemented by dialogs such as