openkylin
/
kylin-nm
mirror of https://gitee.com/openkylin/kylin-nm.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge branch '2309bug1' into 'yhkylin/v101' 

bug 184234 调整WiFi输入密码界面交互

See merge request kylinos-src/kylin-nm!232
This commit is contained in:
陈学超 2023-07-26 10:11:27 +00:00
parent 2e10c5667c 890c52c74e
commit c94c89d39a
1 changed files with 13 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/frontend/tab-pages/wlanpage.cpp
View File

@ -893,12 +893,16 @@ void WlanPage::onDeviceManagedChanged(QString deviceName, bool managed)
void WlanPage::onInactivateListWidgetItemChanged(QListWidgetItem *current, QListWidgetItem *previous) void WlanPage::onInactivateListWidgetItemChanged(QListWidgetItem *current, QListWidgetItem *previous)
{ {
if (previous != nullptr) { if (previous != nullptr && previous->sizeHint().height() > NORMAL_HEIGHT) {
QSize normalSize(previous->sizeHint().width(), NORMAL_HEIGHT); QSize normalSize(previous->sizeHint().width(), NORMAL_HEIGHT);
previous->setSizeHint(normalSize); previous->setSizeHint(normalSize);
WlanListItem *p_wlanItem = (WlanListItem*)m_inactivatedNetListWidget->itemWidget(previous); WlanListItem *p_wlanItem = (WlanListItem*)m_inactivatedNetListWidget->itemWidget(previous);
p_wlanItem->setExpanded(false); if (p_wlanItem != nullptr) {
p_wlanItem->setExpanded(false);
}
} }
if (current != nullptr) { if (current != nullptr) {
current->setSelected(false); current->setSelected(false);
} }
@ -906,9 +910,13 @@ void WlanPage::onInactivateListWidgetItemChanged(QListWidgetItem *current, QList
void WlanPage::setInactivateListItemNoSelect() void WlanPage::setInactivateListItemNoSelect()
{ {
if (m_inactivatedNetListWidget->currentItem() != nullptr) { if (m_inactivatedNetListWidget->currentItem() != nullptr
&& m_inactivatedNetListWidget->currentItem()->sizeHint().height() > NORMAL_HEIGHT) {
WlanListItem *p_wlanItem = (WlanListItem*)m_inactivatedNetListWidget->itemWidget(m_inactivatedNetListWidget->currentItem()); WlanListItem *p_wlanItem = (WlanListItem*)m_inactivatedNetListWidget->itemWidget(m_inactivatedNetListWidget->currentItem());
p_wlanItem->setExpanded(false); if (p_wlanItem != nullptr) {
p_wlanItem->setExpanded(false);
}
m_inactivatedNetListWidget->currentItem()->setSelected(false); m_inactivatedNetListWidget->currentItem()->setSelected(false);
} }
} }
@ -1149,6 +1157,7 @@ void WlanPage::onItemHeightChanged(const bool isExpanded, const QString &ssid)
if (isExpanded) { if (isExpanded) {
if (m_expandedItem != p_listWidgetItem) { if (m_expandedItem != p_listWidgetItem) {
onInactivateListWidgetItemChanged(p_listWidgetItem, m_expandedItem);
qDebug()<<LOG_FLAG << "expanded wlan item"; qDebug()<<LOG_FLAG << "expanded wlan item";
m_expandedItem = p_listWidgetItem; m_expandedItem = p_listWidgetItem;
QSize expandedSize(width, EXPANDED_HEIGHT); QSize expandedSize(width, EXPANDED_HEIGHT);