Changeset 63962 in vbox for trunk/src/VBox/Frontends

Timestamp:

Sep 22, 2016 6:02:33 PM (8 years ago)

Author:

vboxsync

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

110851

Message:

FE/Qt: bugref:6899: Accessibility support (step 54): Selector UI: Extend segmented-button with possibility to switch silently (with no signals and event handling interruptions); The latter part is important since allows to fix a crash caused by that stuff.

Location:

trunk/src/VBox/Frontends/VirtualBox/src

Files:

• platform/darwin/UICocoaSpecialControls.h (modified) (1 diff)
• platform/darwin/UICocoaSpecialControls.mm (modified) (1 diff)
• selector/UISelectorWindow.cpp (modified) (1 diff)
• widgets/UISpecialControls.cpp (modified) (1 diff)
• widgets/UISpecialControls.h (modified) (1 diff)

trunk/src/VBox/Frontends/VirtualBox/src/platform/darwin/UICocoaSpecialControls.h

@@ -89 +89 @@
     void setEnabled(int iSegment, bool fEnabled);
 
+    void setSelected(int iSegment);
     void animateClick(int iSegment);
     void onClicked(int iSegment);

trunk/src/VBox/Frontends/VirtualBox/src/platform/darwin/UICocoaSpecialControls.mm

@@ -622 +622 @@
 }
 
+void UICocoaSegmentedButton::setSelected(int iSegment)
+{
+    [nativeRef() setSelectedSegment: iSegment];
+}
+
 void UICocoaSegmentedButton::animateClick(int iSegment)
 {

trunk/src/VBox/Frontends/VirtualBox/src/selector/UISelectorWindow.cpp

@@ -1064 +1064 @@
 void UISelectorWindow::sltPerformSegmentedButtonSwitch(int iSegment)
 {
-    m_pSegmentedButton->animateClick(iSegment);
+    /* Perform silent segmented-button switch: */
+    m_pSegmentedButton->setSelected(iSegment);
+    /* Manually handle that switch as well: */
+    sltHandleSegmentedButtonSwitch(iSegment);
 }
 

trunk/src/VBox/Frontends/VirtualBox/src/widgets/UISpecialControls.cpp

@@ -289 +289 @@
 }
 
+void UIRoundRectSegmentedButton::setSelected(int iSegment)
+{
+    m_pButtons.at(iSegment)->setChecked(true);
+}
+
 void UIRoundRectSegmentedButton::animateClick(int iSegment)
 {

trunk/src/VBox/Frontends/VirtualBox/src/widgets/UISpecialControls.h

@@ -236 +236 @@
     void setEnabled(int iSegment, bool fEnabled);
 
+    void setSelected(int iSegment);
     void animateClick(int iSegment);