From 27b06b16b14f028514b2a409d52001f0e51cd7dd Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Wed, 22 Sep 2021 08:25:36 +0530
Subject: [PATCH] Book details panel: While clicking tags/authors/etc. holding
 down the Ctrl+Shift modifier keys now add the tag to the current search with
 "AND" instead of "OR" when using only Ctrl. Fixes #1943521 [Ctrl-clicking on
 tag browser & book details ignores "match all
 items."](https://bugs.launchpad.net/calibre/+bug/1943521)

---
 src/calibre/gui2/book_details.py | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/calibre/gui2/book_details.py b/src/calibre/gui2/book_details.py
index 2e02adeb1d..2595bed0fe 100644
--- a/src/calibre/gui2/book_details.py
+++ b/src/calibre/gui2/book_details.py
@@ -1031,8 +1031,9 @@ class BookDetails(QWidget):  # {{{
 
         def search_term(field, val):
             append = ''
-            if QApplication.instance().keyboardModifiers() & Qt.KeyboardModifier.ControlModifier:
-                append = 'OR'
+            mods = QApplication.instance().keyboardModifiers()
+            if mods & Qt.KeyboardModifier.ControlModifier:
+                append = 'AND' if mods & Qt.KeyboardModifier.ShiftModifier else 'OR'
 
             self.search_requested.emit(
                 '{}:"={}"'.format(field, val.replace('"', '\\"')),