From 5088ccf1b5e3ffddfc9881c6a790b0454ba6788b Mon Sep 17 00:00:00 2001
From: dreamsourcelabTAI <tzz@dreamsourcelab.com>
Date: Tue, 23 Apr 2024 15:12:54 +0800
Subject: [PATCH] Set the font size of trigger pannel

---
 DSView/pv/dock/triggerdock.cpp | 16 ++++++++++------
 1 file changed, 10 insertions(+), 6 deletions(-)

diff --git a/DSView/pv/dock/triggerdock.cpp b/DSView/pv/dock/triggerdock.cpp
index 5902ce5d..afbcf7b8 100644
--- a/DSView/pv/dock/triggerdock.cpp
+++ b/DSView/pv/dock/triggerdock.cpp
@@ -546,6 +546,7 @@ void TriggerDock::setup_adv_tab()
         _adv_tabWidget->widget(i-1)->deleteLater();
         _adv_tabWidget->removeTab(i-1);
     }
+
     _logic_comboBox_list.clear();
     _value0_lineEdit_list.clear();
     _count_spinBox_list.clear();
@@ -562,9 +563,12 @@ void TriggerDock::setup_adv_tab()
     _value0_ext32_lineEdit_list.clear();
     _value1_ext32_lineEdit_list.clear();
 
-    QFont font("Monaco");
-    font.setStyleHint(QFont::Monospace);
-    font.setFixedPitch(true);
+   // QFont font("Monaco");
+   // font.setStyleHint(QFont::Monospace);
+   // font.setFixedPitch(true);
+
+    QFont font = this->font();
+    font.setPointSizeF(AppConfig::Instance().appOptions.fontSize);
 
     _stage_tabWidget = new QTabWidget(_widget);
     _stage_tabWidget->setTabPosition(QTabWidget::East);
@@ -1091,8 +1095,8 @@ void TriggerDock::UpdateFont()
 
     for(auto o : edits)
     { 
-        if (o != _serial_hex_lineEdit)
-        {
+        if (o != _serial_hex_lineEdit && o->text() != "")
+        { 
             QRect rc = fm.boundingRect(o->text());
             QSize size(rc.width() + 20, rc.height() + 6); 
             o->setMinimumSize(size);
@@ -1109,7 +1113,7 @@ void TriggerDock::UpdateFont()
  
     int pageHeight = (lineH + 15) * lines;
     pageHeight += lineH * 10;
-    pageHeight += 350;
+    pageHeight += 250;
   
     _serial_groupBox->setFixedHeight(pageHeight);
 }