Changeset 87204 in vbox

Timestamp:

Jan 8, 2021 4:44:45 PM (4 years ago)

Author:

vboxsync

Message:

FE/Qt: bugref:9831. Some corrections on the find in page widget

File:

• trunk/src/VBox/Frontends/VirtualBox/src/helpbrowser/UIHelpViewer.cpp (modified) (5 diffs)

trunk/src/VBox/Frontends/VirtualBox/src/helpbrowser/UIHelpViewer.cpp

@@ -30 +30 @@
 #include <QMenu>
 #include <QHBoxLayout>
+#include <QScrollBar>
 #include <QWidgetAction>
 #ifdef RT_OS_SOLARIS
@@ -110 +111 @@
 
     virtual bool eventFilter(QObject *pObject, QEvent *pEvent) /* override */;
+    virtual void keyPressEvent(QKeyEvent *pEvent) /* override */;
 
 private:
@@ -251 +253 @@
 }
 
+void UIFindInPageWidget::keyPressEvent(QKeyEvent *pEvent)
+{
+    switch (pEvent->key())
+    {
+        case  Qt::Key_Escape:
+            emit sigClose();
+            return;
+            break;
+        case Qt::Key_Down:
+            emit sigSelectNextMatch();
+            return;
+            break;
+        case Qt::Key_Up:
+            emit sigSelectPreviousMatch();
+            return;
+            break;
+        default:
+            QIWithRetranslateUI<QWidget>::keyPressEvent(pEvent);
+            break;
+    }
+}
+
 void UIFindInPageWidget::prepare()
 {
@@ -365 +389 @@
     if (!m_pFindInPageWidget)
         return;
+    /* Closing the find in page widget causes QTextBrowser to jump to the top of the document. This hack puts it back into position: */
+    int iPosition = verticalScrollBar()->value();
     /* Try to position the widget somewhere meaningful initially: */
     if (!m_fFindWidgetDragged)
@@ -376 +402 @@
         document()->undo();
         m_pFindInPageWidget->clearSearchField();
+        verticalScrollBar()->setValue(iPosition);
     }
     else