Changeset 79440 in vbox

Timestamp:

Jul 1, 2019 2:52:03 PM (6 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

131694

Message:

FE/Qt: bugref:6143. Preventing redundant calls during layout change

File:

• trunk/src/VBox/Frontends/VirtualBox/src/softkeyboard/UISoftKeyboard.cpp (modified) (4 diffs)

trunk/src/VBox/Frontends/VirtualBox/src/softkeyboard/UISoftKeyboard.cpp

@@ -1134 +1134 @@
     if (!pItem || pItem == m_pLayoutListWidget->currentItem())
         return;
+    m_pLayoutListWidget->blockSignals(true);
     m_pLayoutListWidget->setCurrentItem(pItem);
+    m_pLayoutListWidget->blockSignals(false);
 }
 
@@ -1151 +1153 @@
     if (!m_pLayoutListWidget || layoutNames.size() != layoutUidList.size())
         return;
+    QUuid currentItemUid;
+    if (m_pLayoutListWidget->currentItem())
+        currentItemUid = m_pLayoutListWidget->currentItem()->data(Qt::UserRole).toUuid();
+    m_pLayoutListWidget->blockSignals(true);
     m_pLayoutListWidget->clear();
     for (int i = 0; i < layoutNames.size(); ++i)
@@ -1157 +1163 @@
         pItem->setData(Qt::UserRole, layoutUidList[i]);
         m_pLayoutListWidget->addItem(pItem);
-    }
+        if (layoutUidList[i] == currentItemUid)
+            m_pLayoutListWidget->setCurrentItem(pItem);
+    }
+    m_pLayoutListWidget->blockSignals(false);
 }
 
@@ -1205 +1214 @@
     pLayout->addWidget(m_pLayoutListWidget);
     connect(m_pLayoutListWidget, &QListWidget::currentItemChanged, this, &UILayoutSelector::sltCurrentItemChanged);
+
     m_pLayoutListWidget->setSelectionMode(QAbstractItemView::SingleSelection);
     QHBoxLayout *pButtonsLayout = new QHBoxLayout;