Changeset 45588 in vbox for trunk/src

Timestamp:

Apr 17, 2013 1:49:06 PM (12 years ago)

Author:

vboxsync

Message:

FE/Qt: Popup-center / Popup-pane: Moving resize animation from hovering to focusing signals.

Location:

trunk/src/VBox/Frontends/VirtualBox/src/widgets

Files:

• UIPopupPane.cpp (modified) (13 diffs)
• UIPopupPane.h (modified) (2 diffs)

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

@@ -82 +82 @@
 signals:
 
-    /* Notifiers: Hover stuff: */
+    /* Notifiers: Animation stuff: */
     void sigHoverEnter();
     void sigHoverLeave();
+    void sigFocusEnter();
+    void sigFocusLeave();
 
 public:
@@ -121 +123 @@
 signals:
 
-    /* Notifiers: Hover stuff: */
+    /* Notifier: Animation stuff: */
     void sigHoverEnter();
     void sigHoverLeave();
+    void sigFocusEnter();
+    void sigFocusLeave();
     void sigGeometryChanged();
 
@@ -180 +184 @@
     , m_iButtonEsc(0)
     , m_fHovered(false)
+    , m_fFocused(false)
     , m_pMainFrame(0), m_pTextPane(0), m_pButtonBox(0)
     , m_pButton1(0), m_pButton2(0), m_pButton3(0)
@@ -292 +297 @@
                 break;
             }
+            case QEvent::FocusIn:
+            {
+                if (!m_fFocused)
+                {
+                    m_fFocused = true;
+                    emit sigFocusEnter();
+                }
+                break;
+            }
+            case QEvent::FocusOut:
+            {
+                if (m_fFocused && (pWatched == m_pButton1 ||
+                                   pWatched == m_pButton2 ||
+                                   pWatched == m_pButton3))
+                {
+                    m_fFocused = false;
+                    emit sigFocusLeave();
+                }
+                break;
+            }
             /* Default case: */
             default: break;
@@ -415 +440 @@
     /* Prepare this: */
     installEventFilter(this);
-    setFocusPolicy(Qt::StrongFocus);
     /* Create main-frame: */
     m_pMainFrame = new UIPopupPaneFrame(this);
@@ -421 +445 @@
         /* Prepare frame: */
         m_pMainFrame->installEventFilter(this);
+        m_pMainFrame->setFocusPolicy(Qt::StrongFocus);
         /* Create message-label: */
         m_pTextPane = new UIPopupPaneTextPane(m_pMainFrame);
@@ -463 +488 @@
         if (pButton && pButton->isDefault())
         {
-            setFocusProxy(pButton);
+            m_pMainFrame->setFocusProxy(pButton);
             m_pTextPane->setFocusProxy(pButton);
             break;
@@ -472 +497 @@
     if (m_pButton1)
     {
+        m_pButton1->installEventFilter(this);
         connect(m_pButton1, SIGNAL(clicked()), SLOT(done1()));
         if (!m_strButtonText1.isEmpty())
@@ -480 +506 @@
     if (m_pButton2)
     {
+        m_pButton2->installEventFilter(this);
         connect(m_pButton2, SIGNAL(clicked()), SLOT(done2()));
         if (!m_strButtonText2.isEmpty())
@@ -488 +515 @@
     if (m_pButton3)
     {
+        m_pButton3->installEventFilter(this);
         connect(m_pButton3, SIGNAL(clicked()), SLOT(done3()));
         if (!m_strButtonText3.isEmpty())
@@ -547 +575 @@
     QPushButton *pButton = pButtonBox->addButton(strText, role);
 
+    /* Configure button: */
+    pButton->setFocusPolicy(Qt::StrongFocus);
+
     /* Configure 'default' button: */
     if (iButton & AlertButtonOption_Default)
-    {
         pButton->setDefault(true);
-        pButton->setFocusPolicy(Qt::StrongFocus);
-        pButton->setFocus();
-    }
 
     /* Return button: */
@@ -579 +606 @@
 void UIPopupPaneFrame::prepare()
 {
-    /* Install 'hover' animation for 'opacity' property: */
+    /* Propagate parent signals: */
     connect(parent(), SIGNAL(sigHoverEnter()), this, SIGNAL(sigHoverEnter()));
     connect(parent(), SIGNAL(sigHoverLeave()), this, SIGNAL(sigHoverLeave()));
+    connect(parent(), SIGNAL(sigFocusEnter()), this, SIGNAL(sigFocusEnter()));
+    connect(parent(), SIGNAL(sigFocusLeave()), this, SIGNAL(sigFocusLeave()));
+    /* Install 'hover' animation for 'opacity' property: */
     UIAnimationFramework::installPropertyAnimation(this, QByteArray("opacity"),
                                                    m_iDefaultOpacity, m_iHoveredOpacity, m_iHoverAnimationDuration,
@@ -677 +707 @@
 void UIPopupPaneTextPane::prepare()
 {
-    /* Install 'hover' animation for 'height' property: */
+    /* Propagate parent signals: */
     connect(parent(), SIGNAL(sigHoverEnter()), this, SIGNAL(sigHoverEnter()));
     connect(parent(), SIGNAL(sigHoverLeave()), this, SIGNAL(sigHoverLeave()));
+    connect(parent(), SIGNAL(sigFocusEnter()), this, SIGNAL(sigFocusEnter()));
+    connect(parent(), SIGNAL(sigFocusLeave()), this, SIGNAL(sigFocusLeave()));
+    /* Install 'focus' animation for 'height' property: */
     UIAnimationFramework::installPropertyAnimation(this, QByteArray("percentage"),
                                                    m_iDefaultPercentage, m_iHoveredPercentage, m_iHoverAnimationDuration,
-                                                   SIGNAL(sigHoverEnter()), SIGNAL(sigHoverLeave()));
+                                                   SIGNAL(sigFocusEnter()), SIGNAL(sigFocusLeave()));
     /* Prepare content: */
     prepareContent();

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

@@ -50 +50 @@
 signals:
 
-    /* Notifiers: Hover stuff: */
+    /* Notifiers: Animation stuff: */
     void sigHoverEnter();
     void sigHoverLeave();
+    void sigFocusEnter();
+    void sigFocusLeave();
 
     /* Notifier: Complete stuff: */
@@ -133 +135 @@
     int m_iButtonEsc;
 
-    /* Variables: Hover stuff: */
+    /* Variables: Animation stuff: */
     bool m_fHovered;
+    bool m_fFocused;
 
     /* Widgets: */