From 1815ea092af7f33c776bbf88dc2870cbcb83f6cf Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Mon, 6 Jan 2014 13:13:11 +0530
Subject: [PATCH] ...

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

diff --git a/src/calibre/gui2/tweak_book/char_select.py b/src/calibre/gui2/tweak_book/char_select.py
index cc25d846ab..671aa4d847 100644
--- a/src/calibre/gui2/tweak_book/char_select.py
+++ b/src/calibre/gui2/tweak_book/char_select.py
@@ -476,6 +476,7 @@ class CharDelegate(QStyledItemDelegate):
     def __init__(self, parent=None):
         QStyledItemDelegate.__init__(self, parent)
         self.item_size = QSize(32, 32)
+        self.np_pat = re.compile(r'(sp|j|nj|ss|fs|ds)$')
 
     def sizeHint(self, option, index):
         return self.item_size
@@ -501,10 +502,10 @@ class CharDelegate(QStyledItemDelegate):
         painter.drawText(option.rect, Qt.AlignHCenter | Qt.AlignBottom | Qt.TextSingleLine, chr(charcode))
 
     def paint_non_printing(self, painter, option, charcode):
-        text = re.sub(r'(sp|j|nj|ss|fs|ds)$', r'\n\1', non_printing[charcode])
+        text = self.np_pat.sub(r'\n\1', non_printing[charcode])
         painter.drawText(option.rect, Qt.AlignCenter | Qt.TextWordWrap | Qt.TextWrapAnywhere, text)
         painter.setPen(QPen(Qt.DashLine))
-        painter.drawRect(option.rect)
+        painter.drawRect(option.rect.adjusted(1, 1, -1, -1))
 
 class CharView(QListView):