Changeset 79456 in vbox

Timestamp:

Jul 1, 2019 7:16:35 PM (6 years ago)

Author:

vboxsync

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

131712

Message:

FE/Qt: bugref:6143. Removing some unnecessary updates

Location:

trunk/src/VBox/Frontends/VirtualBox/src/softkeyboard

Files:

• UISoftKeyboard.cpp (modified) (6 diffs)
• UISoftKeyboard.h (modified) (1 diff)

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

@@ -3207 +3207 @@
     QString strLayoutName = pCurrentLayout ? pCurrentLayout->name() : QString();
     updateStatusBarMessage(strLayoutName);
-    updateLayoutSelector();
 }
 
@@ -3242 +3241 @@
         return;
     m_pKeyboardWidget->update();
-    updateLayoutSelector();
+    updateLayoutSelectorList();
     UISoftKeyboardLayout *pCurrentLayout = m_pKeyboardWidget->currentLayout();
 
@@ -3282 +3281 @@
         return;
     m_pKeyboardWidget->copyCurentLayout();
-    updateLayoutSelector();
+    updateLayoutSelectorList();
 }
 
@@ -3295 +3294 @@
     if (m_pKeyboardWidget)
         m_pKeyboardWidget->deleteCurrentLayout();
+    updateLayoutSelectorList();
+    if (m_pKeyboardWidget && m_pKeyboardWidget->currentLayout() && m_pLayoutSelector)
+        m_pLayoutSelector->setCurrentLayout(m_pKeyboardWidget->currentLayout()->name());
 }
 
@@ -3462 +3464 @@
         }
     }
+    updateLayoutSelectorList();
+    if (m_pKeyboardWidget && m_pKeyboardWidget->currentLayout() && m_pLayoutSelector)
+        m_pLayoutSelector->setCurrentLayout(m_pKeyboardWidget->currentLayout()->name());
 }
 
@@ -3478 +3483 @@
 }
 
-void UISoftKeyboard::updateLayoutSelector()
+void UISoftKeyboard::updateLayoutSelectorList()
 {
     if (!m_pKeyboardWidget || !m_pLayoutSelector)
         return;
     m_pLayoutSelector->setLayoutList(m_pKeyboardWidget->layoutNameList(), m_pKeyboardWidget->layoutUidList());
-    m_pLayoutSelector->setCurrentLayout(m_pKeyboardWidget->currentLayout() ? m_pKeyboardWidget->currentLayout()->name() : QString());
 }
 

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

@@ -97 +97 @@
     void configure();
     void updateStatusBarMessage(const QString &strLayoutName);
-    void updateLayoutSelector();
+    void updateLayoutSelectorList();
     void setDialogGeometry(const QRect &geometry);
     CKeyboard& keyboard() const;