Merge branch '2309bug-0717' into 'yhkylin/v101'

fix bug 181605 181614 修改托盘多网卡combox最大宽度

See merge request kylinos-src/kylin-nm!219
This commit is contained in:
赵世旭 2023-07-17 09:15:16 +00:00
commit cba787ffc3
2 changed files with 4 additions and 1 deletions

View File

@ -71,7 +71,9 @@ void TabPage::initUI()
m_deviceLabel = new QLabel(m_deviceFrame);
m_deviceLabel->setText(tr("Current Device"));
m_deviceComboBox = new QComboBox(m_deviceFrame);
m_deviceComboBox->setFixedWidth(DEVICE_COMBOBOX_WIDTH);
m_deviceComboBox->setMinimumWidth(DEVICE_COMBOBOX_WIDTH);
m_deviceComboBox->setMaximumWidth(DEVICE_COMBOBOX_WIDTH_MAX);
m_deviceComboBox->setSizeAdjustPolicy(QComboBox::SizeAdjustPolicy::AdjustToContents);
m_tipsLabel = new QLabel(m_deviceFrame);
m_tipsLabel->setText(tr("Devices Closed!"));

View File

@ -50,6 +50,7 @@ using namespace kdk;
#define TITLE_LAYOUT_MARGINS 24,0,24,0
#define DEVICE_LAYOUT_MARGINS 24,0,24,8
#define DEVICE_COMBOBOX_WIDTH 180
#define DEVICE_COMBOBOX_WIDTH_MAX 230
#define ACTIVE_NET_LAYOUT_MARGINS 8,8,8,8
#define NET_LAYOUT_MARGINS 8,8,0,1
#define NET_LAYOUT_SPACING 8