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

Book list: Workaround for change in Qt 6 behavior where clicking on an already selected row does not deselect other rows

Browse Source 
It's not clear to me why this is a bad thing, but since its a change in
behavior from calibre < 6, revert it.
This commit is contained in:
Kovid Goyal 2022-12-02 09:07:16 +05:30
parent 7e7b8e75e6
commit e7e5be3b7b
No known key found for this signature in database
GPG Key ID: 06BC317B515ACE7C
1 changed files with 15 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -12,7 +12,7 @@ from collections import OrderedDict
from qt.core import ( from qt.core import (
QTableView, Qt, QAbstractItemView, QMenu, pyqtSignal, QFont, QModelIndex, QTableView, Qt, QAbstractItemView, QMenu, pyqtSignal, QFont, QModelIndex,
QIcon, QItemSelection, QMimeData, QDrag, QStyle, QPoint, QUrl, QHeaderView, QEvent, QIcon, QItemSelection, QMimeData, QDrag, QStyle, QPoint, QUrl, QHeaderView, QEvent,
QStyleOptionHeader, QItemSelectionModel, QSize, QFontMetrics, QApplication, QStyleOptionHeader, QItemSelectionModel, QSize, QFontMetrics,
QDialog, QGridLayout, QPushButton, QDialogButtonBox, QLabel, QSpinBox) QDialog, QGridLayout, QPushButton, QDialogButtonBox, QLabel, QSpinBox)
from calibre.constants import islinux from calibre.constants import islinux
@ -1176,7 +1176,8 @@ class BooksView(QTableView): # {{{
# }}} # }}}
def handle_mouse_press_event(self, ev): def handle_mouse_press_event(self, ev):
if QApplication.keyboardModifiers() & Qt.KeyboardModifier.ShiftModifier: m = ev.modifiers()
if m & Qt.KeyboardModifier.ShiftModifier:
# Shift-Click in QTableView is badly behaved. # Shift-Click in QTableView is badly behaved.
index = self.indexAt(ev.pos()) index = self.indexAt(ev.pos())
if not index.isValid(): if not index.isValid():
@ -1228,7 +1229,18 @@ class BooksView(QTableView): # {{{
# ensure clicked row is always selected # ensure clicked row is always selected
index, QItemSelectionModel.SelectionFlag.Select | QItemSelectionModel.SelectionFlag.Rows) index, QItemSelectionModel.SelectionFlag.Select | QItemSelectionModel.SelectionFlag.Rows)
else: else:
return QTableView.mousePressEvent(self, ev) if (
m == Qt.KeyboardModifier.NoModifier and ev.button() == Qt.MouseButton.LeftButton and
self.editTriggers() & QAbstractItemView.EditTrigger.SelectedClicked
):
# As of Qt 6 , Qt does not clear a multi-row selection when the
# edit triggers contain SelectedClicked and the clicked row is
# already selected, so do it ourselves
index = self.indexAt(ev.pos())
sm = self.selectionModel()
if index.isValid() and sm.isSelected(index):
self.select_rows((index,), using_ids=False, change_current=False, scroll=False)
QTableView.mousePressEvent(self, ev)
@property @property
def column_map(self): def column_map(self):