text-toolbar-chapter-icons支持显示选中态

Author: JackChen

TeXmacs/progs/generic/text-toolbar.scm

@@ -149,7 +149,7 @@
           (dynamic (focus-variant-menu t))))))
 
 ;; 提取当前选区对应的章节层级节点。
-(tm-define (chatper-selection-tree . opt-t)
+(tm-define (chapter-selection-tree . opt-t)
   (with l '(chapter section subsection subsubsection)
     (if (nnull? opt-t)
         (and (tree-in? (car opt-t) (numbered-unnumbered-append l))
@@ -166,11 +166,11 @@
 
 ;; 返回当前章节节点可切换的结构变体列表。
 (tm-define (focus-variants-of t)
-  (:require (chatper-selection-tree t))
-  (chatper-selection-tree t))
+  (:require (chapter-selection-tree t))
+  (chapter-selection-tree t))
 
-(menu-bind text-toolbar-chatper-icons
-  (with t (chatper-selection-tree)
+(menu-bind text-toolbar-chapter-icons
+  (with t (chapter-selection-tree)
     (when (and t (numbered-context? t))
       ((check (balloon (icon "tm_numbered.xpm") "Numbered") "v"
               (numbered-numbered? t))
@@ -222,8 +222,8 @@
   (not (not (semantic-block-selection-tree))))
 
 ;; 判断当前选区是否处于章节标题上下文中。
-(tm-define (chatper-selection-context? t)
-  (not (not (chatper-selection-tree))))
+(tm-define (chapter-selection-context? t)
+  (not (not (chapter-selection-tree))))
 
 ;; 合并两个模式列表，并去掉重复项。
 (define (mode-list-union l1 l2)
@@ -304,7 +304,7 @@
         ((table-of-contents-selection-context? t) #f)
         ((image-selection-context? t) #f)
         ((table-selection-context? t) 'table)
-        ((chatper-selection-context? t) 'chatper)
+        ((chapter-selection-context? t) 'chapter)
         ((semantic-block-selection-context? t) 'semantic)
         ((math-selection-context? t) 'math)
         ((text-selection-context? t) 'text)
@@ -315,8 +315,8 @@
     (cond
      ((== context 'table)
       (link text-toolbar-table-icons))
-     ((== context 'chatper)
-      (link text-toolbar-chatper-icons))
+     ((== context 'chapter)
+      (link text-toolbar-chapter-icons))
      ((== context 'semantic)
       (link text-toolbar-semantic-icons))
      ((== context 'text)

devel/201_63.md

@@ -20,15 +20,15 @@
    - ✅ 纯文本选区（`text`，且不包含图片）
    - ✅ 纯数学选区（`math`）
    - ✅ 表格或单元格相关选区（`table`）
-   - ✅ 章节标题相关选区（`chatper`）
+   - ✅ 章节标题相关选区（`chapter`）
    - ✅ 语义块相关选区，如 theorem / proposition（`semantic`）
 
    **建议按 `TeXmacs/tests/tmu/201_63.tmu` 分区手动验证**：
    - `toc`：选中目录内任意内容，或直接选中整个目录，不应该显示文本悬浮框
    - `math`：选中公式，应该显示数学工具栏
    - `text`：选中文字，应该显示文本工具栏
    - `table`：选中表格/单元格，应该显示表格工具栏
-   - `chatper`：选中章节标题，应该显示章节工具栏
+   - `chapter`：选中章节标题，应该显示章节工具栏
    - `semantic`：选中 theorem / proposition 等，应该显示语义工具栏
 
    **不会显示的情况**（满足任一）：

src/Plugins/Qt/QTMTextPopup.cpp

@@ -36,6 +36,29 @@
 #include <algorithm>
 #include <cmath>
 
+namespace {
+void
+prepareTextPopupButton (QToolButton* button, QAction* action) {
+  if (button == nullptr || action == nullptr) return;
+
+  // Match focus-toolbar semantics: a check-backed toolbar action is rendered
+  // selected whenever TeXmacs marks it as checkable.
+  action->setChecked (action->isCheckable ());
+
+  button->setObjectName ("base_popup_button");
+  button->setAutoRaise (true);
+  button->setDefaultAction (action);
+  button->setPopupMode (QToolButton::InstantPopup);
+#if defined(Q_OS_MAC)
+  button->setProperty ("platform", "mac");
+#endif
+  if (tm_style_sheet == "") button->setStyle (qtmstyle ());
+  button->setCheckable (action->isCheckable ());
+  button->setChecked (action->isChecked ());
+  button->update ();
+}
+} // namespace
+
 // 悬浮工具栏创建函数
 QTMTextPopup::QTMTextPopup (QWidget* parent, qt_simple_widget_rep* owner)
     : QTMBasePopup (parent, owner) {
@@ -98,11 +121,7 @@ QTMTextPopup::rebuildButtonsFromScheme () {
     }
 
     QToolButton* button= new QToolButton (this);
-    button->setObjectName ("base_popup_button");
-    button->setAutoRaise (true);
-    button->setDefaultAction (action);
-    button->setPopupMode (QToolButton::InstantPopup);
-    if (tm_style_sheet == "") button->setStyle (qtmstyle ());
+    prepareTextPopupButton (button, action);
     layout->addWidget (button);
   }
 }
@@ -198,9 +217,7 @@ QTMTextPopup::updateButtonsFromScheme () {
         if (stale_action) button->removeAction (stale_action);
       }
       button->setMenu (nullptr);
-      button->setDefaultAction (action);
-      button->setPopupMode (QToolButton::InstantPopup);
-      if (tm_style_sheet == "") button->setStyle (qtmstyle ());
+      prepareTextPopupButton (button, action);
     }
     cached_width = width ();
     cached_height= height ();
@@ -236,11 +253,7 @@ QTMTextPopup::updateButtonsFromScheme () {
     }
 
     QToolButton* button= new QToolButton (this);
-    button->setObjectName ("base_popup_button");
-    button->setAutoRaise (true);
-    button->setDefaultAction (action);
-    button->setPopupMode (QToolButton::InstantPopup);
-    if (tm_style_sheet == "") button->setStyle (qtmstyle ());
+    prepareTextPopupButton (button, action);
     if (old_icon_size.isValid ()) button->setIconSize (old_icon_size);
     if (old_button_size.isValid ()) button->setFixedSize (old_button_size);
     layout->addWidget (button);