[201_37] 图片悬浮菜单固定高度 (#2320)

Author: MoonL79

TeXmacs/progs/generic/format-edit.scm

@@ -173,15 +173,15 @@
            (string=? (tree->string (tree-ref t 0)) "par-mode")
            (>= (tree-arity t) 3))
     (tree-set! t 1 align)
-    (debug-message "std-warning" "Invalid tree structure for set-image-alignment")))
+    (debug-message "std-warning" "Invalid tree structure for set-image-alignment" "\n")))
 
 (tm-define (get-image-alignment t)
   (if (and (tree-is? t 'with) 
            (tree-is? (tree-ref t 0) 'string)
            (string=? (tree->string (tree-ref t 0)) "par-mode")
            (>= (tree-arity t) 3))
     (tree->string (tree-ref t 1))
-    (debug-message "std-warning" "Invalid tree structure for get-image-alignment")))
+    (debug-message "std-warning" "Invalid tree structure for get-image-alignment" "\n")))
 
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 ;; Inserting and toggling with-like tags

TeXmacs/tests/tmu/201_37.tmu

@@ -10,6 +10,14 @@
 + 测试左对齐、居中、右对齐按钮功能是否正常
 + 弹出菜单后，上下滚动页面，菜单应始终保持在图片上方
 + 查看当前对齐方式所对应的按钮是否正常高亮
++ 按住ctrl/command，滚动滚轮，查看菜单大小是否跟随变化，以及悬浮菜单上边缘是否介于两行之间。
++ 按住ctrl/command，持续缩小，通过 **(get-window-zoom-factor)** 获取页面缩放值， 当缩放值在 **0.35320088300220753** （即大概35.3%）及以下时，菜单应消失。
+
+## 2025/12/22 图片悬浮菜单固定高度
+
+### What
++ 让图片悬浮菜单固定高度为单行段落，且能够随缩放变化大小。
++ 缩放很小的时候坐标会有问题，但此时图标已经非常小，显示菜单已经没有意义，因此在缩放因子<=0.16时让菜单取消显示。
 
 ## 2025/12/22 对齐方式按钮突出显示
 

devel/201_37.md

@@ -39,39 +39,25 @@ QTMImagePopup::QTMImagePopup (QWidget* parent, qt_simple_widget_rep* owner)
   effect->setOffset (0, 4);
   effect->setColor (QColor (0, 0, 0, 120));
   this->setGraphicsEffect (effect);
-
-  QScreen*     Screen= QGuiApplication::primaryScreen ();
-  const double Dpi   = Screen ? Screen->logicalDotsPerInch () : 96.0;
-  const double Scale = Dpi / 96.0;
-#if defined(Q_OS_MAC)
-  const int IconSize= int (50 * Scale);
-#else
-  const int IconSize= int (40 * Scale);
-#endif
-
   leftBtn= new QToolButton ();
   leftBtn->setObjectName ("image-align-button");
   leftBtn->setProperty ("icon-name", "left");
   leftBtn->setIcon (QIcon (":/window-bar/left-align.svg"));
-  leftBtn->setIconSize (QSize (IconSize, IconSize));
   leftBtn->setCheckable (true);
   middleBtn= new QToolButton ();
   middleBtn->setObjectName ("image-align-button");
   middleBtn->setProperty ("icon-name", "center");
   middleBtn->setIcon (QIcon (":/window-bar/middle-align.svg"));
-  middleBtn->setIconSize (QSize (IconSize, IconSize));
   middleBtn->setCheckable (true);
   rightBtn= new QToolButton ();
   rightBtn->setObjectName ("image-align-button");
   rightBtn->setProperty ("icon-name", "right");
   rightBtn->setIcon (QIcon (":/window-bar/right-align.svg"));
-  rightBtn->setIconSize (QSize (IconSize, IconSize));
   rightBtn->setCheckable (true);
   ocrBtn= new QToolButton ();
   ocrBtn->setObjectName ("image-align-button");
   ocrBtn->setProperty ("icon-name", "ocr");
   ocrBtn->setIcon (QIcon (":/window-bar/ocr.svg"));
-  ocrBtn->setIconSize (QSize (IconSize, IconSize));
   QButtonGroup* alignGroup= new QButtonGroup (this);
   alignGroup->addButton (leftBtn);
   alignGroup->addButton (middleBtn);
@@ -101,7 +87,11 @@ void
 QTMImagePopup::showImagePopup (rectangle selr, double magf, int scroll_x,
                                int scroll_y, int canvas_x) {
   cachePosition (selr, magf, scroll_x, scroll_y, canvas_x);
-  this->adjustSize ();
+  if (cached_magf <= 0.16) {
+    setFixedSize (0, 0);
+    return;
+  }
+  autoSize ();
   int x, y;
   getCachedPosition (x, y);
   QPoint topLeft (x, y);
@@ -138,6 +128,26 @@ QTMImagePopup::updatePosition () {
   move (pos_x, pos_y);
 }
 
+void
+QTMImagePopup::autoSize () {
+  QScreen*     Screen    = QGuiApplication::primaryScreen ();
+  const double Dpi       = Screen ? Screen->logicalDotsPerInch () : 96.0;
+  const double Scale     = Dpi / 96.0;
+  const int    baseWidth = 200;
+  const int    baseHeight= 50;
+  double       totalScale= Scale * cached_magf * 3.3;
+#if defined(Q_OS_MAC)
+  const int IconSize= int (50 * Scale);
+#else
+  const int IconSize= int (40 * totalScale);
+#endif
+  leftBtn->setIconSize (QSize (IconSize, IconSize));
+  middleBtn->setIconSize (QSize (IconSize, IconSize));
+  rightBtn->setIconSize (QSize (IconSize, IconSize));
+  ocrBtn->setIconSize (QSize (IconSize, IconSize));
+  setFixedSize (int (baseWidth * totalScale), int (baseHeight * totalScale));
+}
+
 void
 QTMImagePopup::cachePosition (rectangle selr, double magf, int scroll_x,
                               int scroll_y, int canvas_x) {

src/Plugins/Qt/QTMImagePopup.cpp

@@ -50,6 +50,7 @@ class QTMImagePopup : public QWidget {
   void scrollBy (int x, int y);
   void setImageTree (tree t);
   void updateButtonStates ();
+  void autoSize ();
 
 protected:
   void cachePosition (rectangle selr, double magf, int scroll_x, int scroll_y,