From e8a27bb203fe2aff70390a5eca002d7438da9b0f Mon Sep 17 00:00:00 2001
From: mrDarker <mr.darker@163.com>
Date: 星期三, 22 十月 2025 14:24:34 +0800
Subject: [PATCH] Merge branch 'clh' into liuyang
---
SourceCode/Bond/Servo/CPanelAttributes.cpp | 5 +++--
1 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/SourceCode/Bond/Servo/CPanelAttributes.cpp b/SourceCode/Bond/Servo/CPanelAttributes.cpp
index fb2200b..611ebac 100644
--- a/SourceCode/Bond/Servo/CPanelAttributes.cpp
+++ b/SourceCode/Bond/Servo/CPanelAttributes.cpp
@@ -59,6 +59,7 @@
SetDlgItemText(IDC_LABEL_TITLE, pStep->getName().c_str());
SERVO::CAttributeVector attrubutes;
pStep->getAttributeVector(attrubutes);
+ attrubutes.sortWithWeight();
unsigned int nSize = attrubutes.size();
for (unsigned int i = 0; i < nSize; i++) {
SERVO::CAttribute* pAttribute = attrubutes.getAttribute(i);
@@ -66,7 +67,7 @@
pAttribute->getName().c_str(),
pAttribute->getValue().c_str(),
pAttribute->getDescription().c_str());
- pProperty->AllowEdit(TRUE);
+ pProperty->AllowEdit(FALSE);
m_gridCtrl.AddProperty(pProperty);
}
}
@@ -161,7 +162,7 @@
y += 8;
- GetDlgItem(IDC_MFCPROPERTYGRID1)->MoveWindow(5, y, rcClient.Width() - 13, rcClient.Height() - 3 - y);
+ GetDlgItem(IDC_MFCPROPERTYGRID1)->MoveWindow(5, y, rcClient.Width() - 8, rcClient.Height() - 3 - y);
}
#define ATTRIBUTES_PANEL_MIN_WIDTH 88
--
Gitblit v1.9.3