From 016a62b95ea32617cd2771378fd69946875e0bf9 Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Tue, 19 Oct 2021 14:45:23 +0530
Subject: [PATCH] Comments editor: Fix the formatting buttons not showing the
 current state correctly

---
 src/calibre/gui2/comments_editor.py | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

diff --git a/src/calibre/gui2/comments_editor.py b/src/calibre/gui2/comments_editor.py
index d3ee7e140f..01259a1f0e 100644
--- a/src/calibre/gui2/comments_editor.py
+++ b/src/calibre/gui2/comments_editor.py
@@ -349,10 +349,10 @@ class EditorWidget(QTextEdit, LineEditECM):  # {{{
 
     def update_cursor_position_actions(self):
         c = self.textCursor()
+        tcf = c.charFormat()
         ls = c.currentList()
         self.action_ordered_list.setChecked(ls is not None and ls.format().style() == QTextListFormat.Style.ListDecimal)
         self.action_unordered_list.setChecked(ls is not None and ls.format().style() == QTextListFormat.Style.ListDisc)
-        tcf = c.charFormat()
         vert = tcf.verticalAlignment()
         self.action_superscript.setChecked(vert == QTextCharFormat.VerticalAlignment.AlignSuperScript)
         self.action_subscript.setChecked(vert == QTextCharFormat.VerticalAlignment.AlignSubScript)
@@ -398,30 +398,35 @@ class EditorWidget(QTextEdit, LineEditECM):  # {{{
             fmt.setFontWeight(
                 QFont.Weight.Bold if c.charFormat().fontWeight() != QFont.Weight.Bold else QFont.Weight.Normal)
             c.mergeCharFormat(fmt)
+        self.update_cursor_position_actions()
 
     def do_italic(self):
         with self.editing_cursor() as c:
             fmt = QTextCharFormat()
             fmt.setFontItalic(not c.charFormat().fontItalic())
             c.mergeCharFormat(fmt)
+        self.update_cursor_position_actions()
 
     def do_underline(self):
         with self.editing_cursor() as c:
             fmt = QTextCharFormat()
             fmt.setFontUnderline(not c.charFormat().fontUnderline())
             c.mergeCharFormat(fmt)
+        self.update_cursor_position_actions()
 
     def do_strikethrough(self):
         with self.editing_cursor() as c:
             fmt = QTextCharFormat()
             fmt.setFontStrikeOut(not c.charFormat().fontStrikeOut())
             c.mergeCharFormat(fmt)
+        self.update_cursor_position_actions()
 
     def do_vertical_align(self, which):
         with self.editing_cursor() as c:
             fmt = QTextCharFormat()
             fmt.setVerticalAlignment(which)
             c.mergeCharFormat(fmt)
+        self.update_cursor_position_actions()
 
     def do_superscript(self):
         self.do_vertical_align(QTextCharFormat.VerticalAlignment.AlignSuperScript)
@@ -441,6 +446,7 @@ class EditorWidget(QTextEdit, LineEditECM):  # {{{
                     ls.setFormat(lf)
             else:
                 ls = c.createList(fmt)
+        self.update_cursor_position_actions()
 
     def do_ordered_list(self):
         self.do_list(QTextListFormat.Style.ListDecimal)
@@ -454,6 +460,7 @@ class EditorWidget(QTextEdit, LineEditECM):  # {{{
             fmt = QTextBlockFormat()
             fmt.setAlignment(which)
             c.mergeBlockFormat(fmt)
+        self.update_cursor_position_actions()
 
     def do_align_left(self):
         self.do_alignment(Qt.AlignmentFlag.AlignLeft)
@@ -479,6 +486,7 @@ class EditorWidget(QTextEdit, LineEditECM):  # {{{
         with self.editing_cursor() as c:
             c.setBlockFormat(QTextBlockFormat())
             c.setCharFormat(QTextCharFormat())
+        self.update_cursor_position_actions()
 
     def do_copy(self):
         self.copy()
@@ -502,6 +510,7 @@ class EditorWidget(QTextEdit, LineEditECM):  # {{{
             bf = c.blockFormat()
             bf.setTextIndent(bf.textIndent() + 2 * self.em_size * mult)
             c.setBlockFormat(bf)
+        self.update_cursor_position_actions()
 
     def do_indent(self):
         self.indent_block()
@@ -562,6 +571,7 @@ class EditorWidget(QTextEdit, LineEditECM):  # {{{
             c.mergeBlockFormat(bf)
             if pos is not None:
                 c.setPosition(pos)
+        self.update_cursor_position_actions()
 
     def do_color(self):
         col = QColorDialog.getColor(Qt.GlobalColor.black, self,