V6.7.4 追加更新

scene/BarcodeEditor.cpp

@@ -57,9 +57,8 @@ BarcodeEditor::BarcodeEditor(QWidget *parent) :
 
     connect(ui->cbBoxType, QOverload<int>::of(&QComboBox::currentIndexChanged), this, &BarcodeEditor::onTypeChanged);
 
-    connect(&m_barcodeFormatEditor, &DlgBarcodeFormat::accepted, this, &BarcodeEditor::onBarcodeFormatConfirmed);
-    connect(&m_qrcodeFormatEditor, &DlgQrcodeFormat::accepted, this, &BarcodeEditor::onQrcodeFormatConfirmed);
-
+    m_barcodeFormatEditor.setParent(this, m_barcodeFormatEditor.windowFlags());
+    m_qrcodeFormatEditor.setParent(this, m_qrcodeFormatEditor.windowFlags());
     m_barcodeFormatEditor.setWindowModality(Qt::WindowModality::WindowModal);
     m_qrcodeFormatEditor.setWindowModality(Qt::WindowModality::WindowModal);
     m_barcodeFormatEditor.setWindowTitle(tr("BarCode Format"));
@@ -294,11 +293,15 @@ void BarcodeEditor::onBtnFormatClicked()
 {
     if(m_vm.type == BARCODE_TYPE_BARCODE) {
         m_barcodeFormatEditor.setViewModel(m_vm.format.value<DlgBarcodeFormatVM>());
-        m_barcodeFormatEditor.show();
+        if (m_barcodeFormatEditor.exec() == QDialog::Accepted) {
+            onBarcodeFormatConfirmed();
+        }
     }
     else {
         m_qrcodeFormatEditor.setViewModel(m_vm.format.value<DlgQrcodeFormatVM>());
-        m_qrcodeFormatEditor.show();
+        if (m_qrcodeFormatEditor.exec() == QDialog::Accepted) {
+            onQrcodeFormatConfirmed();
+        }
     }
 }
 

scene/DlgBarcodeFormat.ui

@@ -359,6 +359,15 @@ QSpinBox::down-arrow {
    </property>
   </widget>
  </widget>
+ <tabstops>
+  <tabstop>BarCodeType</tabstop>
+  <tabstop>comboBoxInkColor</tabstop>
+  <tabstop>BarCodeHeigh</tabstop>
+  <tabstop>BarCodeScale</tabstop>
+  <tabstop>BarCodeDot</tabstop>
+  <tabstop>checkBoxAddText</tabstop>
+  <tabstop>checkBtn</tabstop>
+ </tabstops>
  <resources/>
  <connections>
   <connection>

scene/pictextitem.cpp

@@ -404,7 +404,7 @@ QImage PicTextItem::strToImage(const QString &str)
 QPointF PicTextItem::clampItemPos(const QPointF &p)
 {
     return QPointF (std::min(qreal(scene()->width() - boundingRect().width()), std::max(0.0, p.x())),
-                   std::min(qreal(scene()->height() - boundingRect().height()), std::max(0.0, p.y())));
+                   std::min((qreal(scene()->height() + 1) - boundingRect().height()), std::max(0.0, p.y())));
 }
 
 TextItemModel TextItemModel::fromItem(PicTextItem *item)