调整寄存器显示布局

libzqt/zui/z_function_list_box.cpp

@@ -14,14 +14,14 @@ ZQFunctionListBox::ZQFunctionListBox(QWidget *parent, const QString &title, int
   m_column = column;
 
   // add QSpacer
-  m_verticalSpacer = new QSpacerItem(20, 100, QSizePolicy::Minimum, QSizePolicy::Expanding);
+  // m_verticalSpacer = new QSpacerItem(20, 100, QSizePolicy::Minimum, QSizePolicy::Expanding);
   // m_hSpacer        = new QSpacerItem(100, 20, QSizePolicy::Expanding, QSizePolicy::Minimum);
 
   for (size_t i = 0; i < column; i++) {
     layout->setColumnStretch(i, 1);
   }
   // add Spacer
-  m_layout->addItem(m_verticalSpacer, 0, 0, 1, 1);
+  // m_layout->addItem(m_verticalSpacer, 0, 0, 1, 1);
   // if (m_column > 1) m_layout->addItem(m_hSpacer, 0, m_column - 1, 1, 1);
 
   // add Box To Tab
@@ -30,7 +30,7 @@ ZQFunctionListBox::ZQFunctionListBox(QWidget *parent, const QString &title, int
 
 void ZQFunctionListBox::regOnException(function<void(const zexception &e)> onException) { m_onException = onException; }
 void ZQFunctionListBox::newFunc(QString zh_name, QStringList params, std::function<void(int argn, const char **args)> onButtonClick) {
-  m_layout->removeItem(m_verticalSpacer);
+  // m_layout->removeItem(m_verticalSpacer);
   // m_layout->removeItem(m_hSpacer);
 
   int rowcnt = m_layout->rowCount();
@@ -76,7 +76,7 @@ void ZQFunctionListBox::newFunc(QString zh_name, QStringList params, std::functi
     });
   });
 
-  m_layout->addItem(m_verticalSpacer, rowcnt + 1, 0, 1, 1);
+  // m_layout->addItem(m_verticalSpacer, rowcnt + 1, 0, 1, 1);
   // if (m_column > 1) m_layout->addItem(m_hSpacer, rowcnt + 1, m_column - 1, 1, 1);
 
   if (!workQ.isWorking()) {

libzqt/zui/z_reg_table_list_box.cpp

@@ -66,6 +66,11 @@ ZRegTableList::ZRegTableList(QWidget *parent, const QString &title)  //
   this->setLayout(m_layout);
   parent->layout()->addWidget(this);
 
+  QSizePolicy sizePolicy(QSizePolicy::Preferred, QSizePolicy::Preferred);
+  sizePolicy.setHorizontalStretch(0);
+  sizePolicy.setVerticalStretch(1);
+  this->setSizePolicy(sizePolicy);
+
   {
     // funcBox
     {
@@ -87,7 +92,7 @@ ZRegTableList::ZRegTableList(QWidget *parent, const QString &title)  //
           testar->setWidget(m_arWidget);         // 将设置好的幕布嵌入到滚动显示区域
           testar->setWidgetResizable(true);      // 设置幕布自适应大小
           testar->setSizePolicy(sp);
-          testar->setMinimumSize(700, 500);
+          // testar->setMinimumSize(700, 500);
         }
 
         m_regBoxLayoutL1 = new QVBoxLayout(m_regBox);
@@ -101,8 +106,7 @@ ZRegTableList::ZRegTableList(QWidget *parent, const QString &title)  //
   parent->layout()->addWidget(this);
 }
 void ZRegTableList::addSpacer() {
-  m_layout->addItem(new QSpacerItem(20, 100, QSizePolicy::Minimum, QSizePolicy::Expanding));
-  m_regBoxLayoutL2->addItem(new QSpacerItem(20, 100, QSizePolicy::Minimum, QSizePolicy::Expanding));
+  m_regBoxLayoutL2->addItem(new QSpacerItem(20, 1, QSizePolicy::Minimum, QSizePolicy::Expanding));
 }
 
 void ZRegTableList::addReg(QString title, int addr, uint32_t flag) {

libzqt/zui/zq_vtab_page.cpp

@@ -16,6 +16,6 @@ void ZQVTabPage::addBox(QGroupBox *box) {
 }
 
 void ZQVTabPage::addSpacer() {
-  m_verticalSpacer = new QSpacerItem(20, 1000, QSizePolicy::Minimum, QSizePolicy::Expanding);
+  m_verticalSpacer = new QSpacerItem(20, 1, QSizePolicy::Expanding, QSizePolicy::Expanding);
   m_layout->addItem(m_verticalSpacer);
 }

src/mainwindow.ui

@@ -6,8 +6,8 @@
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>1458</width>
-    <height>556</height>
+    <width>1497</width>
+    <height>940</height>
    </rect>
   </property>
   <property name="sizePolicy">
@@ -971,9 +971,33 @@ QScrollBar::add-page:vertical, QScrollBar::sub-page:vertical {
             <property name="contextMenuPolicy">
              <enum>Qt::DefaultContextMenu</enum>
             </property>
+            <property name="tabPosition">
+             <enum>QTabWidget::North</enum>
+            </property>
+            <property name="tabShape">
+             <enum>QTabWidget::Rounded</enum>
+            </property>
             <property name="currentIndex">
              <number>0</number>
             </property>
+            <property name="elideMode">
+             <enum>Qt::ElideLeft</enum>
+            </property>
+            <property name="usesScrollButtons">
+             <bool>false</bool>
+            </property>
+            <property name="documentMode">
+             <bool>false</bool>
+            </property>
+            <property name="tabsClosable">
+             <bool>false</bool>
+            </property>
+            <property name="movable">
+             <bool>false</bool>
+            </property>
+            <property name="tabBarAutoHide">
+             <bool>false</bool>
+            </property>
             <widget class="QWidget" name="tab">
              <attribute name="title">
               <string>基础页</string>
@@ -1140,7 +1164,7 @@ p, li { white-space: pre-wrap; }
     <rect>
      <x>0</x>
      <y>0</y>
-     <width>1458</width>
+     <width>1497</width>
      <height>20</height>
     </rect>
    </property>