update

client/gui/props/CameraPropertySection.cpp

@@ -4,6 +4,9 @@
 
 #include <QCheckBox>
 #include <QDoubleSpinBox>
+
+#include "widgets/CompactNumericSpinBox.h"
+#include "widgets/PropertyPanelControls.h"
 #include <QFormLayout>
 #include <QLabel>
 #include <QLineEdit>
@@ -13,32 +16,29 @@ namespace gui {
 
 CameraPropertySection::CameraPropertySection(QWidget* parent) : PropertySectionWidget(parent) {
     auto* lay = new QVBoxLayout(this);
-    lay->setContentsMargins(0, 0, 0, 0);
-    lay->setSpacing(6);
+    polishPropertyVBoxLayout(lay);
 
     auto* form = new QFormLayout();
-    form->setContentsMargins(0, 0, 0, 0);
-    form->setSpacing(6);
+    polishPropertyFormLayout(form);
 
-    m_name = new QLineEdit(this);
+    m_name = new PropertyPanelLineEdit(this);
     m_name->setPlaceholderText(QStringLiteral("显示名称…"));
+    polishPropertyStretchyTextField(m_name);
     form->addRow(QStringLiteral("名称"), m_name);
 
     m_center = new Vec2ParamControl(this);
-    m_center->setToolTip(QStringLiteral("摄像机中心（世界坐标），与画布上黄色圆点一致"));
+    m_center->setToolTip({});
     form->addRow(QStringLiteral("中心"), m_center);
 
-    m_viewScale = new QDoubleSpinBox(this);
+    m_viewScale = new CompactDoubleSpinBox(this, 56);
     m_viewScale->setRange(1e-4, 1000.0);
     m_viewScale->setDecimals(5);
     m_viewScale->setSingleStep(0.01);
-    m_viewScale->setToolTip(QStringLiteral(
-        "视口缩放：在参考分辨率 1600×900 下的像素/世界单位比（与预览、画布上镜头框一致）；"
-        "不随当前窗口大小改变镜头覆盖的世界范围。数值越小，可见的世界范围越大。"));
+    m_viewScale->setToolTip({});
     form->addRow(QStringLiteral("缩放"), m_viewScale);
 
-    m_activePreview = new QCheckBox(QStringLiteral("用作预览展示镜头"), this);
-    m_activePreview->setToolTip(QStringLiteral("进入预览展示时，按该摄像机在当前帧的位置与缩放呈现画面"));
+    m_activePreview = new PropertyPanelCheckBox(QStringLiteral("用作预览展示镜头"), this);
+    m_activePreview->setToolTip({});
     form->addRow(QStringLiteral("预览"), m_activePreview);
 
     lay->addLayout(form);
@@ -47,7 +47,7 @@ CameraPropertySection::CameraPropertySection(QWidget* parent) : PropertySectionW
     connect(m_name, &QLineEdit::editingFinished, this, [this]() {
         if (m_name) emit displayNameCommitted(m_name->text());
     });
-    connect(m_center, &Vec2ParamControl::valueChanged, this, [this](double x, double y) { emit centerEdited(x, y); });
+    connect(m_center, &Vec2ParamControl::valueChanged, this, [this](int x, int y) { emit centerEdited(x, y); });
     connect(m_viewScale, qOverload<double>(&QDoubleSpinBox::valueChanged), this,
             &CameraPropertySection::viewScaleEdited);
     connect(m_activePreview, &QCheckBox::toggled, this, &CameraPropertySection::activePreviewToggled);
@@ -69,7 +69,7 @@ void CameraPropertySection::clearDisconnected() {
     }
     if (m_center) {
         m_center->blockSignals(true);
-        m_center->setValue(0.0, 0.0);
+        m_center->setValue(0, 0);
         m_center->blockSignals(false);
     }
     if (m_viewScale) {
@@ -91,9 +91,9 @@ void CameraPropertySection::applyState(const CameraPropertyUiState& s) {
         m_name->setText(s.displayName);
         m_name->blockSignals(false);
     }
-    if (m_center) {
+    if (m_center && !m_center->isActivelyEditing()) {
         m_center->blockSignals(true);
-        m_center->setValue(s.centerWorld.x(), s.centerWorld.y());
+        m_center->setValue(qRound(s.centerWorld.x()), qRound(s.centerWorld.y()));
         m_center->blockSignals(false);
     }
     if (m_viewScale) {